Merge branch 'develop' into feature/JAL-2759
authorkiramt <k.mourao@dundee.ac.uk>
Tue, 21 Nov 2017 10:27:55 +0000 (10:27 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Tue, 21 Nov 2017 10:27:55 +0000 (10:27 +0000)
commitd5702bf3268c2688e90d645ec635ad5bb5d3a76e
treea10a7230279c8db1fa6ef4ffe6a69a3dee07a6e6
parent9317de4ce997ec39dee25ec507c12807c5067d7d
parent657ebfc85b968d91f400923f821df27e87a76c1f
Merge branch 'develop' into feature/JAL-2759

Conflicts:
benchmarking/src/main/java/org/jalview/HiddenColumnsBenchmark.java
src/jalview/gui/AlignViewport.java
benchmarking/README
src/jalview/appletgui/ScalePanel.java
src/jalview/appletgui/SeqCanvas.java
src/jalview/datamodel/Sequence.java
src/jalview/datamodel/SequenceI.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/ScalePanel.java
src/jalview/gui/SeqCanvas.java
test/jalview/datamodel/SequenceTest.java