Merge branch 'feature/JAL-2613' into feature/JAL-2611
authorkiramt <k.mourao@dundee.ac.uk>
Fri, 14 Jul 2017 09:01:25 +0000 (10:01 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Fri, 14 Jul 2017 09:01:25 +0000 (10:01 +0100)
commit9db5c5efc51b819623790eaf1b7145dd2936d029
tree58727b84da146f451f2f8298192bffba012a6c74
parent964c4a6836f02a8b58c5eac7c6722e60c90d72d0
parent44b924cfd6b3aab4e7fa279062aab20e88c3b591
Merge branch 'feature/JAL-2613' into feature/JAL-2611

Conflicts:
src/jalview/viewmodel/OverviewDimensions.java
src/jalview/viewmodel/OverviewDimensions.java
test/jalview/viewmodel/OverviewDimensionsHideHiddenTest.java
test/jalview/viewmodel/OverviewDimensionsShowHiddenTest.java