git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f4766a7 9245b43)
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)
Conflicts:
src/jalview/analysis/AlignmentUtils.java
src/jalview/gui/PopupMenu.java
src/jalview/io/vcf/VCFLoader.java


Trivial merge