Merge branch 'develop' into feature/JAL-2759
authorkiramt <k.mourao@dundee.ac.uk>
Wed, 8 Nov 2017 16:06:14 +0000 (16:06 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Wed, 8 Nov 2017 16:06:14 +0000 (16:06 +0000)
commit0c83c631f7d7db0baad3335805c15dd40c0aed59
treef8e1e6b1ab49d3ad0af52c7ec7531b7bdde6a2e7
parentdab7d55392edfa7307e8d7be5f5dde69c9808f30
parent517fd15cba49e7459d9b937461103d2522b927d8
Merge branch 'develop' into feature/JAL-2759

Conflicts:
src/jalview/gui/SeqCanvas.java
src/jalview/renderer/ScaleRenderer.java
test/jalview/datamodel/SequenceTest.java
16 files changed:
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/AnnotationColumnChooser.java
src/jalview/appletgui/AnnotationLabels.java
src/jalview/appletgui/ScalePanel.java
src/jalview/datamodel/Sequence.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/AnnotationColumnChooser.java
src/jalview/gui/AnnotationLabels.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/ScalePanel.java
src/jalview/gui/SeqCanvas.java
src/jalview/renderer/ScaleRenderer.java
src/jalview/util/MappingUtils.java
test/jalview/datamodel/SequenceTest.java
test/jalview/util/MappingUtilsTest.java