Merge branch 'develop' into trialMerge
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 6 Jun 2019 13:33:40 +0000 (14:33 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 6 Jun 2019 13:33:40 +0000 (14:33 +0100)
commit74393b51f368cb9f58589472d432a433d9c4386d
tree8bad6090c3b0b6f8d2929d3f944d445ce6d9c0f1
parent7a0d503181fe41452120a8a02ca63476392aa08c
parent1413ed295402b90cccddc8ee814cb5be0d1fc75e
Merge branch 'develop' into trialMerge

Conflicts:
src/jalview/datamodel/features/SequenceFeatures.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/SeqPanel.java
src/jalview/project/Jalview2XML.java
src/jalview/renderer/seqfeatures/FeatureRenderer.java
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
test/jalview/io/Jalview2xmlTests.java
18 files changed:
src/jalview/analysis/scoremodels/FeatureDistanceModel.java
src/jalview/api/FeatureRenderer.java
src/jalview/appletgui/SeqPanel.java
src/jalview/datamodel/features/SequenceFeatures.java
src/jalview/ext/jmol/JalviewJmolBinding.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/FeatureTypeSettings.java
src/jalview/gui/SeqPanel.java
src/jalview/io/vcf/VCFLoader.java
src/jalview/project/Jalview2XML.java
src/jalview/renderer/seqfeatures/FeatureRenderer.java
src/jalview/structure/StructureSelectionManager.java
src/jalview/viewmodel/AlignmentViewport.java
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
test/jalview/gui/FeatureSettingsTest.java
test/jalview/io/FeaturesFileTest.java
test/jalview/project/Jalview2xmlTests.java
test/jalview/renderer/seqfeatures/FeatureColourFinderTest.java