git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5cd3ea 057fd89)
Merge branch 'merge/JAL-3628+JAL-3608+JAL-3609+JAL-3541+Release_2_11_1_Branch' into...
authorJim Procter <jprocter@issues.jalview.org>
Wed, 5 Aug 2020 14:47:31 +0000 (15:47 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 5 Aug 2020 14:47:31 +0000 (15:47 +0100)
1  2 
resources/lang/Messages.properties patch | diff1 | diff2 | blob | history
resources/lang/Messages_es.properties patch | diff1 | diff2 | blob | history
src/jalview/bin/Jalview.java patch | diff1 | diff2 | blob | history

diff --cc resources/lang/Messages.properties
Simple merge
diff --cc resources/lang/Messages_es.properties
Simple merge
diff --cc src/jalview/bin/Jalview.java
Simple merge