Merge branch 'features/JAL-2446NCList' into bug/JAL-2541cutWithFeatures
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 27 Jun 2017 16:35:24 +0000 (17:35 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 27 Jun 2017 16:35:24 +0000 (17:35 +0100)
commit1e4f81da4ca1c584213557180c1358ede40880d4
tree87b065687b1cf4f7da7ff33ea995e003641b7d14
parent7e9e238cd202a04c405adee8fa95cc68546c3ec5
parentd065bc916cb63af83cdab7319f5177a855724aba
Merge branch 'features/JAL-2446NCList' into bug/JAL-2541cutWithFeatures
(Undo fails outstanding to resolve)

Conflicts:
src/jalview/datamodel/Sequence.java
src/jalview/datamodel/SequenceI.java
test/jalview/datamodel/SequenceTest.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/SequenceFeatures.java
test/jalview/commands/EditCommandTest.java
test/jalview/datamodel/SequenceTest.java
test/jalview/datamodel/features/FeatureStoreTest.java
test/jalview/datamodel/features/SequenceFeaturesTest.java