Merge remote-tracking branch 'origin/releases/Release_2_10_2b1_Branch'
authorkiramt <k.mourao@dundee.ac.uk>
Mon, 28 Aug 2017 11:15:35 +0000 (12:15 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Mon, 28 Aug 2017 11:15:35 +0000 (12:15 +0100)
commit9e2b4ccd9c95ffa75130bf808b0037ea6a1054ca
tree3b50db713fc8b2981a980fc3e56f7c98513085b3
parent4dd40d33a5becefd51c31a426f2501b21029f82c
parent806c9dc4a3d841fe36e7d17ab45d783a9fc95f26
Merge remote-tracking branch 'origin/releases/Release_2_10_2b1_Branch'
into bug/JAL-2665-2.10.2b

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