git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca8504c 62a8fd3)
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 patch | diff1 | diff2 | blob | history
src/jalview/gui/CrossRefAction.java patch | diff1 | diff2 | blob | history
src/jalview/io/vcf/VCFLoader.java patch | diff1 | diff2 | blob | history
src/jalview/project/Jalview2XML.java patch | diff1 | diff2 | blob | history
test/jalview/project/Jalview2xmlTests.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/gui/CrossRefAction.java
Simple merge
diff --cc src/jalview/io/vcf/VCFLoader.java
Simple merge
diff --cc src/jalview/project/Jalview2XML.java
Simple merge
diff --cc test/jalview/project/Jalview2xmlTests.java
index f5044bb,5f1256c..521ef81
--- 1/test/jalview/project/Jalview2xmlTests.java
--- 2/test/jalview/project/Jalview2xmlTests.java
+++ b/test/jalview/project/Jalview2xmlTests.java
@@@ -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;