git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7451c64 2a35abb)
Merge branch 'features/JAL-2393customMatrices' into develop
authorJim Procter <jprocter@issues.jalview.org>
Thu, 4 May 2017 08:52:21 +0000 (09:52 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 4 May 2017 08:52:21 +0000 (09:52 +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