Merge branch 'feature/JAL-3187linkedFeatures' into merge/JAL-3187_JAL-3010
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 19 Feb 2019 12:01:15 +0000 (12:01 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 19 Feb 2019 12:01:15 +0000 (12:01 +0000)
commit834b2f0f7bee2c61ab68b285d5e81ff94b425400
tree859f88f5a7aa19c03a46240a6ee004fca35d2665
parent50452c1ba64e6a8eb7fb06a79b779357d6488cbf
parentc6d5255c09855fc1b0d03a085da9988a75cd3898
Merge branch 'feature/JAL-3187linkedFeatures' into
merge/JAL-3187_JAL-3010

Conflicts:
src/jalview/gui/FeatureSettings.java
src/jalview/renderer/seqfeatures/FeatureRenderer.java
src/jalview/gui/FeatureSettings.java