Merge branch 'feature/JAL-2759' into merge/JAL-2759_2104
authorJim Procter <jprocter@issues.jalview.org>
Tue, 27 Feb 2018 11:16:41 +0000 (11:16 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 27 Feb 2018 11:16:41 +0000 (11:16 +0000)
commitaad3640b07f836362df7ea025fa09127a0a06145
treec14104e60adbc644735a13b1cf3b778ad9d63da7
parent783c351b9a8aed11ea41c9db193e8ae3be20b017
parent8c5cefb3ac80bd094a8dab7ce6735a11583b1772
Merge branch 'feature/JAL-2759' into merge/JAL-2759_2104
13 files changed:
src/jalview/appletgui/AnnotationLabels.java
src/jalview/datamodel/Alignment.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/AnnotationLabels.java
src/jalview/gui/AnnotationPanel.java
src/jalview/gui/IdCanvas.java
src/jalview/gui/ScalePanel.java
src/jalview/gui/SeqCanvas.java
src/jalview/viewmodel/AlignmentViewport.java
src/jalview/viewmodel/OverviewDimensionsHideHidden.java
src/jalview/viewmodel/OverviewDimensionsShowHidden.java
test/jalview/datamodel/AlignmentTest.java