Merge remote-tracking branch 'origin/features/JAL-2609fastPaintWrapped'
authorkiramt <k.mourao@dundee.ac.uk>
Tue, 10 Oct 2017 13:34:50 +0000 (14:34 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Tue, 10 Oct 2017 13:34:50 +0000 (14:34 +0100)
commit79d9f7d16d1a5fe58ad2b91a0ee1a0bbe6938373
tree1f0860711a318d4ef840dc52fe53b186416401b5
parent612e5d088076c3db73608deddfa1da02c1c5c5dc
parent8ec596f7eef1aec80c0daf94441dfb88cd070a4f
Merge remote-tracking branch 'origin/features/JAL-2609fastPaintWrapped'
into bug/JAL-2690attemptedmerge

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