git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a4a5ad f5d913e)
Merge branch 'develop' into features/JAL-2393customMatrices
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 24 Apr 2017 11:32:32 +0000 (12:32 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 24 Apr 2017 11:32:32 +0000 (12:32 +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