Merge branch 'develop' into Jalview-JS/develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 20 Mar 2019 15:19:48 +0000 (15:19 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 20 Mar 2019 15:19:48 +0000 (15:19 +0000)
commit0b79ea556e792594cab9bd2b4f6cba3b01abaf24
tree9034c667019aec24988bad65db1d6f9b4e6957bb
parentc6432941c60d6b39d6253db638f242d33a724049
parentdc2734d988e10f3e76dda02d9913b611f6713552
Merge branch 'develop' into Jalview-JS/develop

Conflicts:
src/jalview/gui/AlignFrame.java
src/jalview/gui/ScalePanel.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/ScalePanel.java
src/jalview/gui/SeqPanel.java