Merge remote-tracking branch 'origin/develop' into bug/JAL-2591 bug/JAL-2591
authorkiramt <k.mourao@dundee.ac.uk>
Thu, 15 Jun 2017 10:54:40 +0000 (11:54 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Thu, 15 Jun 2017 10:54:40 +0000 (11:54 +0100)
commit54dd5d7c3c4384ef383ead7cf3d150ac5fddb3da
tree22d9377934400ee2342c201f9ba2a5f41039aba6
parente3b40f631de8ed0f1ba12cfb5ce353eb89af7820
parent8a6f2af24f832baf9899c7b0c8f4f723c592bc99
Merge remote-tracking branch 'origin/develop' into bug/JAL-2591
src/jalview/appletgui/AnnotationColumnChooser.java
src/jalview/gui/AnnotationColumnChooser.java