git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e6ef3b ca9a7a8)
Merge branch 'develop' into bug/JAL-4238_PAEs_not_being_shown_in_JalviewJS
authorBen Soares <b.soares@dundee.ac.uk>
Tue, 23 Jan 2024 17:07:58 +0000 (17:07 +0000)
committerBen Soares <b.soares@dundee.ac.uk>
Tue, 23 Jan 2024 17:07:58 +0000 (17:07 +0000)
1  2 
src/jalview/bin/Commands.java patch | diff1 | diff2 | blob | history
src/jalview/bin/argparser/ArgValuesMap.java patch | diff1 | diff2 | blob | history
src/jalview/gui/AnnotationLabels.java patch | diff1 | diff2 | blob | history
src/jalview/gui/Desktop.java patch | diff1 | diff2 | blob | history
src/jalview/gui/StructureChooser.java patch | diff1 | diff2 | blob | history
src/jalview/structure/StructureSelectionManager.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/bin/Commands.java
Simple merge
diff --cc src/jalview/gui/AnnotationLabels.java
Simple merge
diff --cc src/jalview/gui/Desktop.java
Simple merge
diff --cc src/jalview/gui/StructureChooser.java
Simple merge