Merge branch 'develop' into features/JAL-2349_matrixvis
authorJim Procter <jprocter@issues.jalview.org>
Wed, 5 Jul 2017 15:06:42 +0000 (16:06 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 5 Jul 2017 15:06:42 +0000 (16:06 +0100)
commit393c021841078b08e5d020f73b7215ef949526f6
treee9f0ff17baf92a4ce97f15e283124efc5487e1f4
parentf0396bb4ab9e52c708accd64eb326b0f1262637e
parentda2128d3430fc1617555e6c2f2ea9c235a06d108
Merge branch 'develop' into features/JAL-2349_matrixvis
src/jalview/appletgui/AnnotationPanel.java
src/jalview/gui/AnnotationPanel.java
src/jalview/viewmodel/AlignmentViewport.java