Merge remote-tracking branch 'origin/develop' into bug/JAL-2665-2.10.3
authorkiramt <k.mourao@dundee.ac.uk>
Mon, 28 Aug 2017 11:23:58 +0000 (12:23 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Mon, 28 Aug 2017 11:23:58 +0000 (12:23 +0100)
commit2dd39c36211f947fda099c550e711ef5905efefd
tree71cce4db8b9cd07ae0e7477256863feac830f75f
parent4dd40d33a5becefd51c31a426f2501b21029f82c
parent0114cedba6810550ddf05a8f6b8bec8da4f0d1d7
Merge remote-tracking branch 'origin/develop' into bug/JAL-2665-2.10.3

Conflicts:
src/jalview/gui/SeqCanvas.java
src/jalview/datamodel/SequenceGroup.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/SeqCanvas.java
src/jalview/gui/SeqPanel.java