git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f5a1843 a604feb)
Merge branch 'develop' into bug/JAL-4421_customise_volume_name_of_DMG_installers
authorBen Soares <b.soares@dundee.ac.uk>
Wed, 5 Jun 2024 14:03:52 +0000 (15:03 +0100)
committerBen Soares <b.soares@dundee.ac.uk>
Wed, 5 Jun 2024 14:03:52 +0000 (15:03 +0100)
1  2 
src/jalview/gui/CutAndPasteTransfer.java patch | diff1 | diff2 | blob | history
src/jalview/gui/Desktop.java patch | diff1 | diff2 | blob | history
src/jalview/project/Jalview2XML.java patch | diff1 | diff2 | blob | history

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