git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3659ecf 421c0cd)
Merge branch 'develop' into feature/JAL-1713_overviewInProject
authorJames Procter <j.procter@dundee.ac.uk>
Mon, 13 Feb 2023 17:28:45 +0000 (17:28 +0000)
committerJames Procter <j.procter@dundee.ac.uk>
Mon, 13 Feb 2023 17:28:45 +0000 (17:28 +0000)
1  2 
src/jalview/gui/AlignFrame.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/AlignFrame.java
Simple merge
diff --cc src/jalview/project/Jalview2XML.java
Simple merge
diff --cc test/jalview/project/Jalview2xmlTests.java
index 23a8be6,8886394..91ea959
--- 1/test/jalview/project/Jalview2xmlTests.java
--- 2/test/jalview/project/Jalview2xmlTests.java
+++ b/test/jalview/project/Jalview2xmlTests.java
@@@ -50,9 -48,9 +50,10 @@@ import jalview.api.AlignViewportI
  import jalview.api.AlignmentViewPanel;
  import jalview.api.FeatureColourI;
  import jalview.api.ViewStyleI;
 +import jalview.bin.Cache;
  import jalview.datamodel.AlignmentAnnotation;
  import jalview.datamodel.AlignmentI;
+ import jalview.datamodel.Annotation;
  import jalview.datamodel.DBRefEntry;
  import jalview.datamodel.GeneLocus;
  import jalview.datamodel.HiddenSequences;