Merge remote-tracking branch
authorkiramt <k.mourao@dundee.ac.uk>
Fri, 5 May 2017 11:05:50 +0000 (12:05 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Fri, 5 May 2017 11:05:50 +0000 (12:05 +0100)
commit4d890895e6aabfc36d45d3b53781ee2cf5cfafdc
tree78170cdca4bf809a1fdd2cb7f66ebf5de284a272
parentc55981a5c90618c23b5bedd7ff419d9cae7eef96
parent3c75c089a56859ec8e7f674d7054e82af41e4b77
Merge remote-tracking branch
'origin/features/JAL-2388hiddencolumnschanges' into
features/JAL-2388OverviewWindow

Conflicts:
resources/lang/Messages.properties
15 files changed:
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/AlignViewport.java
src/jalview/appletgui/AnnotationColumnChooser.java
src/jalview/appletgui/SeqPanel.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/AnnotationColumnChooser.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/SeqPanel.java
src/jalview/io/AnnotationFile.java
src/jalview/io/JSONFile.java
src/jalview/viewmodel/AlignmentViewport.java
test/jalview/io/JSONFileTest.java