Merge branch 'features/JAL-2446NCList' into spikes/mungo
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Sat, 24 Jun 2017 10:31:51 +0000 (11:31 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Sat, 24 Jun 2017 10:31:51 +0000 (11:31 +0100)
commit05e90fa615d589a46a9f29a9909d70709e7188d8
treec4e9084d59978f8f4542e9764e4a4f219c0e3637
parent136c0793b90b72b928c4d77dc109dd5c644e00d3
parent7c89d99f5325c91e4a33af7aea6f5c5a94a12d8b
Merge branch 'features/JAL-2446NCList' into spikes/mungo

Conflicts:
help/html/releases.html
src/jalview/datamodel/BinarySequence.java
src/jalview/datamodel/Sequence.java
src/jalview/datamodel/SequenceI.java
src/jalview/datamodel/features/FeatureStore.java
src/jalview/datamodel/features/NCList.java
src/jalview/datamodel/features/NCNode.java
src/jalview/datamodel/features/SequenceFeatures.java
src/jalview/gui/SeqCanvas.java
src/jalview/renderer/seqfeatures/FeatureRenderer.java
src/jalview/schemes/ClustalxColourScheme.java
src/jalview/urls/UrlLinkDisplay.java
test/jalview/datamodel/AlignmentTest.java
test/jalview/datamodel/SequenceTest.java
test/jalview/datamodel/features/FeatureStoreTest.java
test/jalview/datamodel/features/SequenceFeaturesTest.java
test/jalview/urls/UrlLinkDisplayTest.java
src/jalview/datamodel/BinarySequence.java