Merge branch 'features/JAL-2446NCList' into
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 5 Jun 2017 07:57:27 +0000 (08:57 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 5 Jun 2017 07:57:27 +0000 (08:57 +0100)
commit2f219368c3a4a3ff0ed6a34f84d005a3d85c9963
tree10bf5a39b04b8054f755da3bff59b692a36be6d4
parent8eaa775e59bf928f8899f9ada5c9811200c2853a
parentf41d78dbf890fbb7597f75019d05841312fa4f52
Merge branch 'features/JAL-2446NCList' into
features/JAL-2574findFeaturesByColumn

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