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)
commit46b2ffc28aeef5800f35ce31a742a65095e01621
treed9e85bb8250281c56998d49aff7d0573d4f9f102
parentbe6ff1dbfb14dce03ac5b89c3a078d44b4ee75f9
parentcc582640b68867a844998e5f6a790c80f84d9b97
Merge branch 'develop' into features/JAL-2388OverviewWindow
src/jalview/gui/AlignViewport.java
src/jalview/viewmodel/AlignmentViewport.java