git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aab74f8 0d11e2f)
Merge branch 'feature/JAL-3063jaxbNoCastor' into develop
authorJim Procter <jprocter@issues.jalview.org>
Wed, 16 Jan 2019 11:50:22 +0000 (11:50 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 16 Jan 2019 11:50:22 +0000 (11:50 +0000)
JAL-3063 todo: add castor-1.1-cycle.jar back to libraries inorder to ensure VAMSAS functionality remains

1  2 
src/jalview/project/Jalview2XML.java patch | diff1 | diff2 | blob | history
test/jalview/gui/AlignFrameTest.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/project/Jalview2XML.java
index 74b6bf0,b153d9f..4a4c0c2
--- 1/src/jalview/project/Jalview2XML.java
--- 2/src/jalview/project/Jalview2XML.java
+++ b/src/jalview/project/Jalview2XML.java
@@@ -59,10 -49,8 +59,9 @@@ import jalview.gui.AppVarna
  import jalview.gui.ChimeraViewFrame;
  import jalview.gui.Desktop;
  import jalview.gui.FeatureRenderer;
- import jalview.gui.Jalview2XML_V1;
  import jalview.gui.JvOptionPane;
  import jalview.gui.OOMWarning;
 +import jalview.gui.PCAPanel;
  import jalview.gui.PaintRefresher;
  import jalview.gui.SplitFrame;
  import jalview.gui.StructureViewer;
diff --cc test/jalview/gui/AlignFrameTest.java
Simple merge