Merge branch 'bug/JAL-2609attemptedmerge' into develop
authorJim Procter <jprocter@issues.jalview.org>
Mon, 23 Oct 2017 16:17:09 +0000 (17:17 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 23 Oct 2017 16:17:09 +0000 (17:17 +0100)
1  2 
src/jalview/gui/AlignmentPanel.java

Simple merge