Merge branch 'spikes/mungo' into features/JAL-1793VCF
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 4 Dec 2017 15:53:44 +0000 (15:53 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 4 Dec 2017 15:53:44 +0000 (15:53 +0000)
commit14550ad1e5da4b81082a3a06222cbe26eb9435ce
tree87b8a1a8346e3c269b0ace6313eb5d3d1480c0fa
parent27a06af565d224505f2484a9c74743fb3cf69be8
parent296593216c47a835f462d1d74a40b41e4818f737
Merge branch 'spikes/mungo' into features/JAL-1793VCF

Conflicts:
src/jalview/ext/htsjdk/HtsContigDb.java
src/jalview/io/vcf/VCFLoader.java
test/jalview/ext/htsjdk/TestHtsContigDb.java
test/jalview/io/vcf/VCFLoaderTest.java
src/jalview/io/vcf/VCFLoader.java