Merge branch 'features/JAL-1793VCF' into spikes/mungo
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 4 Oct 2017 15:02:59 +0000 (16:02 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 4 Oct 2017 15:02:59 +0000 (16:02 +0100)
commitf708b46b35fe64dce97f5c8420104ba71cc21ff2
tree91cd74a4a293a169202f4081586034faa9f19285
parentf4766a7bbcfae845fc95923b01fa14ff83d589ff
parent9245b43569781ac47b6f58872c77a3bf21bcc362
Merge branch 'features/JAL-1793VCF' into spikes/mungo

Conflicts:
src/jalview/analysis/AlignmentUtils.java
src/jalview/gui/PopupMenu.java
src/jalview/io/vcf/VCFLoader.java