Merge branch 'develop' into feature/JAL-2611
authorkiramt <k.mourao@dundee.ac.uk>
Sat, 22 Jul 2017 09:18:41 +0000 (11:18 +0200)
committerkiramt <k.mourao@dundee.ac.uk>
Sat, 22 Jul 2017 09:18:41 +0000 (11:18 +0200)
commit4a9a2fc8a1b1a66b21e66429083f27a6fc8541b9
treedcddfaed28fd211bc87248ba11f5d23caf042a53
parent30f552046feaba47955d5ffdcec6d0fc67a7e13b
parentddbcb3e33e1a8d4c644472cfa3d28b193da97064
Merge branch 'develop' into feature/JAL-2611

Conflicts:
src/jalview/gui/OverviewPanel.java
src/jalview/viewmodel/OverviewDimensionsHideHidden.java
src/jalview/viewmodel/OverviewDimensionsShowHidden.java
src/jalview/appletgui/OverviewPanel.java
src/jalview/datamodel/HiddenSequences.java
src/jalview/gui/OverviewPanel.java
src/jalview/viewmodel/OverviewDimensions.java
src/jalview/viewmodel/OverviewDimensionsHideHidden.java
src/jalview/viewmodel/OverviewDimensionsShowHidden.java