git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a92d9ee ac3a462)
Merge branch 'feature/JAL-4386_JAL-4435_trees_from_annotations_on_alignment' into...
authorJim Procter <jprocter@dundee.ac.uk>
Fri, 26 Jul 2024 15:02:22 +0000 (16:02 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Fri, 26 Jul 2024 15:02:22 +0000 (16:02 +0100)
1  2 
src/jalview/gui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/project/Jalview2XML.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/gui/AlignFrame.java
Simple merge
diff --cc src/jalview/project/Jalview2XML.java
Simple merge