Merge branch 'bug/JAL-2665-2.10.3' into portforward/JAL-2675_2102b1to2103
authorJim Procter <jprocter@issues.jalview.org>
Tue, 5 Sep 2017 12:58:04 +0000 (13:58 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 5 Sep 2017 12:58:04 +0000 (13:58 +0100)
 Conflicts:
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/SeqCanvas.java

1  2 
src/jalview/gui/SeqCanvas.java

Simple merge