Merge remote-tracking branch 'origin/develop' into features/JAL-2388hiddencolumnschanges
authorkiramt <k.mourao@dundee.ac.uk>
Fri, 5 May 2017 09:50:22 +0000 (10:50 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Fri, 5 May 2017 09:50:22 +0000 (10:50 +0100)
commit3c75c089a56859ec8e7f674d7054e82af41e4b77
tree0509d2da62863772290812b2f1cb981322d39741
parente5b2edf3955c50cfd61799ad12cdc9016603ee1c
parent762dd65b19b26b7f6fb4583a476abfe173f37e49
Merge remote-tracking branch 'origin/develop' into
features/JAL-2388hiddencolumnschanges

Conflicts:
src/jalview/appletgui/TreePanel.java
src/jalview/gui/AnnotationColumnChooser.java
src/jalview/gui/PCAPanel.java
src/jalview/gui/TreePanel.java
17 files changed:
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/AlignViewport.java
src/jalview/appletgui/AnnotationColumnChooser.java
src/jalview/appletgui/PCAPanel.java
src/jalview/appletgui/SeqPanel.java
src/jalview/appletgui/TreePanel.java
src/jalview/datamodel/AlignmentAnnotation.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/AnnotationColumnChooser.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/PCAPanel.java
src/jalview/gui/PopupMenu.java
src/jalview/gui/SeqPanel.java
src/jalview/gui/TreePanel.java
src/jalview/structure/StructureSelectionManager.java