Merge branch 'features/JAL-2446NCList' into features/JAL-2526sequenceCursor
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 5 Jun 2017 07:54:11 +0000 (08:54 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 5 Jun 2017 07:54:11 +0000 (08:54 +0100)
commit88694463a2aea303694231603b61970f72a5a259
tree3fbeffa35d62948b27da949e219ac8ccfd924d48
parentba61fc7a3397ce6b57640e0b19c76392a983768a
parentf41d78dbf890fbb7597f75019d05841312fa4f52
Merge branch 'features/JAL-2446NCList' into
features/JAL-2526sequenceCursor

Conflicts:
src/jalview/datamodel/SequenceI.java
src/jalview/datamodel/Sequence.java
src/jalview/datamodel/SequenceI.java
test/jalview/datamodel/SequenceTest.java