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)
commit95fbeeb7a08be4d24e1164c2f0ff3591893d10e2
tree00a953a533f5cb08a37482b80571329459b05efb
parentb5a209613f14ad6e75f43aa537a96484d847ce0a
parente67951a5b302b6a73cccd4b35e6ec1bdda31dde3
Merge branch 'bug/JAL-2665-2.10.3' into portforward/JAL-2675_2102b1to2103

 Conflicts:
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/SeqCanvas.java
src/jalview/gui/SeqCanvas.java