Merge branch 'develop' into features/JAL-1793VCF
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 26 Oct 2017 13:32:13 +0000 (14:32 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 26 Oct 2017 13:32:13 +0000 (14:32 +0100)
commit06de78be50c3934158fa1d35ec92ad86b54e959f
treea55af9110a793086f5340b92ece31eba21a2dfd0
parent705d1c84c9a03bb0378593e4d8d8a90c8a11f831
parent68a89e0fafd92408be5aba40a9167934944b938d
Merge branch 'develop' into features/JAL-1793VCF

Conflicts:
src/jalview/util/MappingUtils.java
test/jalview/analysis/AlignmentUtilsTests.java
test/jalview/util/MappingUtilsTest.java
src/jalview/analysis/AlignmentUtils.java
src/jalview/datamodel/SequenceFeature.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AquaInternalFrameManager.java
src/jalview/gui/IdPanel.java
src/jalview/gui/SeqPanel.java
src/jalview/util/MappingUtils.java
test/jalview/analysis/AlignmentUtilsTests.java
test/jalview/util/MappingUtilsTest.java