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)
Conflicts:
src/jalview/gui/SeqCanvas.java

1  2 
src/jalview/gui/SeqCanvas.java
src/jalview/gui/SeqPanel.java

Simple merge
Simple merge