Merge branch 'develop' into feature/JAL-3251biotypedMappings
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 7 Jun 2019 15:08:56 +0000 (16:08 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 7 Jun 2019 15:08:56 +0000 (16:08 +0100)
1  2 
src/jalview/analysis/AlignmentUtils.java
src/jalview/gui/CrossRefAction.java
src/jalview/io/vcf/VCFLoader.java
src/jalview/project/Jalview2XML.java
test/jalview/project/Jalview2xmlTests.java

Simple merge
Simple merge
Simple merge
@@@ -67,9 -71,9 +70,10 @@@ import jalview.schemes.RNAHelicesColour
  import jalview.schemes.StrandColourScheme;
  import jalview.schemes.TCoffeeColourScheme;
  import jalview.structure.StructureImportSettings;
+ import jalview.util.MapList;
  import jalview.util.matcher.Condition;
  import jalview.viewmodel.AlignmentViewport;
 +import jalview.viewmodel.seqfeatures.FeatureRendererModel;
  
  import java.awt.Color;
  import java.io.File;