git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 948bd3b b41bffc)
Merge remote-tracking branch 'origin/releases/Release_2_10_4_Branch' into merges... merges/JAL-2906_update2_11_from_2_10_4
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 8 Mar 2018 14:06:44 +0000 (14:06 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 8 Mar 2018 14:06:44 +0000 (14:06 +0000)
1  2 
src/jalview/gui/IdPanel.java patch | diff1 | diff2 | blob | history
src/jalview/gui/SeqPanel.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/gui/IdPanel.java
Simple merge
diff --cc src/jalview/gui/SeqPanel.java
Simple merge