Merge branch 'develop' into features/JAL-1793VCF
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 13 Nov 2017 16:39:02 +0000 (16:39 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 13 Nov 2017 16:39:02 +0000 (16:39 +0000)
commitc68e41c5f6d66c05ded22a514e5b0fa5775627b6
tree6b73ff283efbfc98cc2f92980a224017a2a766f1
parent9f58b747475c9aae8d5acfb52b5c25c778662e4e
parent6dc86748c90f09948e6a6850e2542e55c0464683
Merge branch 'develop' into features/JAL-1793VCF

Conflicts:
.classpath
build.xml
resources/lang/Messages.properties
.classpath
build.xml
resources/lang/Messages.properties
src/jalview/datamodel/Sequence.java
src/jalview/datamodel/SequenceI.java