Merge branch 'develop' into features/JAL-2388OverviewWindow
authorkiramt <k.mourao@dundee.ac.uk>
Tue, 21 Feb 2017 10:53:40 +0000 (10:53 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Tue, 21 Feb 2017 10:53:40 +0000 (10:53 +0000)
1  2 
src/jalview/gui/AlignViewport.java
src/jalview/viewmodel/AlignmentViewport.java

Simple merge