Merge branch 'develop' into feature/JAL-2759 feature/JAL-2759
authorkiramt <k.mourao@dundee.ac.uk>
Tue, 6 Feb 2018 13:28:54 +0000 (13:28 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Tue, 6 Feb 2018 13:28:54 +0000 (13:28 +0000)
commit8c5cefb3ac80bd094a8dab7ce6735a11583b1772
tree5d72b5a27af4174f9b4f3c31d4bb8a3188a37116
parent34b682702fe2dee7a5d79f95960a1accbea17ef6
parent82cba0a99ac7c16b89e8399adb158e6a063fecd3
Merge branch 'develop' into feature/JAL-2759

Conflicts:
benchmarking/README
src/jalview/datamodel/Alignment.java
src/jalview/datamodel/AlignmentAnnotation.java
src/jalview/gui/SeqCanvas.java
src/jalview/gui/SeqPanel.java
benchmarking/README
src/jalview/datamodel/Alignment.java
src/jalview/datamodel/AlignmentAnnotation.java
src/jalview/gui/SeqCanvas.java
src/jalview/gui/SeqPanel.java
src/jalview/io/FormatAdapter.java
src/jalview/renderer/AnnotationRenderer.java
src/jalview/viewmodel/ViewportRanges.java