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)
commit33efc987cb15d2c0d914a8e4299bb77a63c056b2
tree85d947b8f66c7b03750d57e65d7c98a305630af6
parent85b0ca9ab0744c3b84c34a2785bf25e463e1717f
parent8806b7472c39fc7e2707fd1fe3c39064639d9b4f
Merge branch 'develop' into features/JAL-2446NCList
src/jalview/appletgui/FeatureSettings.java
src/jalview/gui/IdPanel.java
test/jalview/io/FeaturesFileTest.java