git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8276f5 18b3340)
Merge branch 'develop' into features/JAL-2295setChimeraAttributes
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 7 Nov 2016 15:58:24 +0000 (15:58 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 7 Nov 2016 15:58:24 +0000 (15:58 +0000)
1  2 
resources/lang/Messages.properties patch | diff1 | diff2 | blob | history

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