git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9795d3a 15c6c67)
Merge branch 'develop' into bug/JAL-3224_getdown_changed_to_unpack_tgz_resources
authorJim Procter <jprocter@issues.jalview.org>
Tue, 23 Apr 2019 15:33:24 +0000 (16:33 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 23 Apr 2019 15:33:24 +0000 (16:33 +0100)
1  2 
resources/lang/Messages.properties patch | diff1 | diff2 | blob | history
resources/lang/Messages_es.properties patch | diff1 | diff2 | blob | history

diff --cc resources/lang/Messages.properties
Simple merge
diff --cc resources/lang/Messages_es.properties
Simple merge