Merge branch 'develop' into bug/JAL-2837 bug/JAL-2837
authorkiramt <k.mourao@dundee.ac.uk>
Fri, 17 Nov 2017 12:14:59 +0000 (12:14 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Fri, 17 Nov 2017 12:14:59 +0000 (12:14 +0000)
commit66e2ef1a1a7767b8ca8d40f108f29e9036166236
tree7c4a2d1728de95c1ae61567f226a3a961cc3f2d8
parent4049384e3d77c203e90d15017abaa5b60203fc58
parent657ebfc85b968d91f400923f821df27e87a76c1f
Merge branch 'develop' into bug/JAL-2837

Conflicts:
src/jalview/gui/SeqPanel.java
src/jalview/gui/SeqPanel.java
src/jalview/viewmodel/ViewportRanges.java