Merge branch 'develop' into features/JAL-2446NCList
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 4 May 2017 11:34:21 +0000 (12:34 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 4 May 2017 11:34:21 +0000 (12:34 +0100)
1  2 
src/jalview/gui/FeatureSettings.java

Simple merge