Merge branch 'develop' into features/JAL-1956_featureStyles
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 10 May 2016 10:17:19 +0000 (11:17 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 10 May 2016 10:17:19 +0000 (11:17 +0100)
commitbf0d052fef43e9809b7170dbfd372b3ea116391b
tree097da0d0dc930ea01960015044a38fa445815479
parent3e943322f9d66e8718316ba8bd03669adce65149
parentbab92f1e137903283c0b0fb986d01b6f91cdd82e
Merge branch 'develop' into features/JAL-1956_featureStyles

Conflicts:
src/jalview/appletgui/FeatureRenderer.java
src/jalview/appletgui/FeatureSettings.java
src/jalview/gui/AnnotationExporter.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/Jalview2XML.java
src/jalview/io/FeaturesFile.java
src/jalview/io/SequenceAnnotationReport.java
src/jalview/schemes/FeatureColourScheme.java
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
src/jalview/ws/jws2/AADisorderClient.java
test/jalview/io/FeaturesFileTest.java
24 files changed:
examples/testdata/simpleGff3.gff
src/jalview/api/FeatureColourI.java
src/jalview/api/FeatureRenderer.java
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/FeatureRenderer.java
src/jalview/appletgui/FeatureSettings.java
src/jalview/ext/ensembl/EnsemblGene.java
src/jalview/gui/AnnotationExporter.java
src/jalview/gui/FeatureRenderer.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/Jalview2XML.java
src/jalview/io/FeaturesFile.java
src/jalview/io/PDBFeatureSettings.java
src/jalview/io/packed/JalviewDataset.java
src/jalview/io/packed/ParsePackedSet.java
src/jalview/renderer/seqfeatures/FeatureRenderer.java
src/jalview/schemes/FeatureColour.java
src/jalview/schemes/GraduatedColor.java
src/jalview/schemes/UserColourScheme.java
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
src/jalview/ws/jws1/SeqSearchWSThread.java
src/jalview/ws/jws2/AADisorderClient.java
test/jalview/io/FeaturesFileTest.java
test/jalview/schemes/FeatureColourTest.java