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)
commitc28dc7d17e5f61210c70217996f9153458f07de0
tree10f69aa47625868501a6b557a8b9eb63a812df6e
parenta326d5f9c4ec46f0b600f5c51d7572fa1c150732
parent8356850ec2f6043a65d3d892f9ebd405f23893e2
Merge branch 'develop' into features/JAL-2446NCList
src/jalview/gui/FeatureSettings.java