git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cd96215 62d037c)
Merge branch 'develop' into bug/JAL-4238_PAEs_not_being_shown_in_JalviewJS
authorBen Soares <b.soares@dundee.ac.uk>
Thu, 16 Nov 2023 11:35:05 +0000 (11:35 +0000)
committerBen Soares <b.soares@dundee.ac.uk>
Thu, 16 Nov 2023 11:35:05 +0000 (11:35 +0000)
1  2 
build.gradle patch | diff1 | diff2 | blob | history
src/jalview/gui/AppJmol.java patch | diff1 | diff2 | blob | history
src/jalview/gui/Desktop.java patch | diff1 | diff2 | blob | history

diff --cc build.gradle
Simple merge
diff --cc src/jalview/gui/AppJmol.java
Simple merge
diff --cc src/jalview/gui/Desktop.java
Simple merge