git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8554d86 6d6e715)
Merge branch 'task/JAL-3608_property_set_laf_and_tests' into develop
authorJim Procter <jprocter@issues.jalview.org>
Wed, 12 Aug 2020 10:15:54 +0000 (11:15 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 12 Aug 2020 10:15:54 +0000 (11:15 +0100)
1  2 
build.gradle patch | diff1 | diff2 | blob | history
src/jalview/bin/Cache.java patch | diff1 | diff2 | blob | history
src/jalview/bin/Jalview.java patch | diff1 | diff2 | blob | history

diff --cc build.gradle
Simple merge
diff --cc src/jalview/bin/Cache.java
Simple merge
diff --cc src/jalview/bin/Jalview.java
Simple merge