Merge branch 'develop' into features/JAL-2609fastPaintWrapped
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 21 Aug 2017 13:36:20 +0000 (14:36 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 21 Aug 2017 13:36:20 +0000 (14:36 +0100)
commit2f96125e48e277a8296e9e2b53719f346f043ceb
treeeca20b5de8bb4e27d8c02207f37fa50c53d7e778
parent5160a2b12eaed0e6fb398ec3ff3805e1630b9b83
parentbe762d8d9c71a7aa3121e845c45911c7192b7827
Merge branch 'develop' into features/JAL-2609fastPaintWrapped

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