Merge branch 'bug/JAL-3072scrollThread' into merge/JAL-3072_3073
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 4 Mar 2019 17:06:13 +0000 (17:06 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 4 Mar 2019 17:06:13 +0000 (17:06 +0000)
commit7e00183505bd4c58d1ce62ee121ed372c3b058f2
treefb678d37bf01529ac1a04caf9db2614f2facf34e
parentbc18effe68ba80213a6d03ca7e6175adc6be71d6
parent08a853afa3f76ec24a175e37bff43dc18ef781b1
Merge branch 'bug/JAL-3072scrollThread' into merge/JAL-3072_3073

Conflicts:
src/jalview/datamodel/Alignment.java
src/jalview/gui/ScalePanel.java
src/jalview/gui/SeqPanel.java
src/jalview/datamodel/Alignment.java
src/jalview/gui/AnnotationPanel.java
src/jalview/gui/IdPanel.java
src/jalview/gui/ScalePanel.java
src/jalview/gui/SeqPanel.java