Merge remote-tracking branch
authorkiramt <k.mourao@dundee.ac.uk>
Mon, 24 Apr 2017 13:13:18 +0000 (14:13 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Mon, 24 Apr 2017 13:13:18 +0000 (14:13 +0100)
commit536a4a9c407a4c07b71e86e75135eaa2ba5e8850
tree587d4005d4ec976066f143eeddd795aad6813dcb
parent14869d2b36336f1fa3e135d83abe64059ad63300
parent04b25d01b22d71e2e4fbb62790b9761b3b9ca9c5
Merge remote-tracking branch
'origin/features/JAL-2388hiddencolumnschanges' into
features/JAL-2388OverviewWindow

Conflicts:
src/jalview/appletgui/OverviewPanel.java
src/jalview/gui/OverviewPanel.java
src/jalview/viewmodel/OverviewDimensions.java
17 files changed:
src/jalview/appletgui/AlignViewport.java
src/jalview/appletgui/OverviewCanvas.java
src/jalview/appletgui/OverviewPanel.java
src/jalview/datamodel/AllColsCollection.java
src/jalview/datamodel/AllColsIterator.java
src/jalview/datamodel/VisibleColsCollection.java
src/jalview/datamodel/VisibleColsIterator.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/OverviewCanvas.java
src/jalview/gui/OverviewPanel.java
src/jalview/viewmodel/AlignmentViewport.java
src/jalview/viewmodel/OverviewDimensions.java
src/jalview/viewmodel/OverviewDimensionsAllVisible.java
src/jalview/viewmodel/OverviewDimensionsWithHidden.java
test/jalview/datamodel/AllColsIteratorTest.java
test/jalview/datamodel/VisibleColsIteratorTest.java
test/jalview/viewmodel/OverviewDimensionsTest.java