Merge remote-tracking branch 'origin/develop' into bug/JAL-2491
authorkiramt <k.mourao@dundee.ac.uk>
Mon, 15 May 2017 10:42:01 +0000 (11:42 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Mon, 15 May 2017 10:42:01 +0000 (11:42 +0100)
commitc2e5d3d1ebe3b283bdde15637c590721cd6c5637
tree41e4ef2af7419ad2eb0733444130cbdc2ab7645f
parent557859a3ea9a1e86899ef2033de90eadb6d87118
parent04d19d44b27b66c342e35b8933776b0ca7da9f35
Merge remote-tracking branch 'origin/develop' into bug/JAL-2491
(not working yet)

Conflicts:
src/jalview/appletgui/AlignmentPanel.java
src/jalview/appletgui/OverviewPanel.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/OverviewPanel.java
src/jalview/gui/SeqPanel.java
src/jalview/viewmodel/OverviewDimensions.java
src/jalview/viewmodel/ViewportRanges.java
test/jalview/viewmodel/OverviewDimensionsTest.java
27 files changed:
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/AlignViewport.java
src/jalview/appletgui/AlignmentPanel.java
src/jalview/appletgui/AnnotationPanel.java
src/jalview/appletgui/IdCanvas.java
src/jalview/appletgui/IdPanel.java
src/jalview/appletgui/OverviewPanel.java
src/jalview/appletgui/ScalePanel.java
src/jalview/appletgui/SeqCanvas.java
src/jalview/appletgui/SeqPanel.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/AnnotationPanel.java
src/jalview/gui/IdCanvas.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/Jalview2XML_V1.java
src/jalview/gui/OverviewPanel.java
src/jalview/gui/ScalePanel.java
src/jalview/gui/SeqCanvas.java
src/jalview/gui/SeqPanel.java
src/jalview/viewmodel/OverviewDimensions.java
src/jalview/viewmodel/OverviewDimensionsHideHidden.java
src/jalview/viewmodel/OverviewDimensionsShowHidden.java
src/jalview/viewmodel/ViewportRanges.java
test/jalview/viewmodel/OverviewDimensionsHideHiddenTest.java
test/jalview/viewmodel/OverviewDimensionsShowHiddenTest.java