git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 85b0ca9 8806b74)
Merge branch 'develop' into features/JAL-2446NCList
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 1 Aug 2017 09:57:49 +0000 (11:57 +0200)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 1 Aug 2017 09:57:49 +0000 (11:57 +0200)
1  2 
src/jalview/appletgui/FeatureSettings.java patch | diff1 | diff2 | blob | history
src/jalview/gui/IdPanel.java patch | diff1 | diff2 | blob | history
test/jalview/io/FeaturesFileTest.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/gui/IdPanel.java
Simple merge
diff --cc test/jalview/io/FeaturesFileTest.java
Simple merge