git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 511db6b 1987cc0)
Merge branch 'bug/JAL-4235_gradle_task_jalviewjsTranspile_does_not_fail_on_eclipse_er...
authorBen Soares <b.soares@dundee.ac.uk>
Tue, 23 Jan 2024 16:42:24 +0000 (16:42 +0000)
committerBen Soares <b.soares@dundee.ac.uk>
Tue, 23 Jan 2024 16:42:24 +0000 (16:42 +0000)
1  2 
build.gradle patch | diff1 | diff2 | blob | history
gradle.properties patch | diff1 | diff2 | blob | history
src/jalview/bin/Commands.java patch | diff1 | diff2 | blob | history
src/jalview/ws/dbsources/Uniprot.java patch | diff1 | diff2 | blob | history

diff --cc build.gradle
Simple merge
diff --cc gradle.properties
Simple merge
diff --cc src/jalview/bin/Commands.java
Simple merge
diff --cc src/jalview/ws/dbsources/Uniprot.java
Simple merge