]> git.donarmstrong.com Git - lilypond.git/commit
Merge remote-tracking branch 'origin/translation' into stable/2.18
authorDavid Kastrup <dak@gnu.org>
Fri, 14 Mar 2014 21:28:13 +0000 (22:28 +0100)
committerDavid Kastrup <dak@gnu.org>
Fri, 14 Mar 2014 21:28:13 +0000 (22:28 +0100)
commit02e841cb511e6aab41b63c9b68ae0ebed5e7d838
treeeabea2299d3afc599715133ae910ba2131ea0509
parent7f4ab2ded9c1c1202719d70a32b3aab6c04fa8dd
parent80b2f1d1488b594606097cfd6cc155ad54e22f9a
Merge remote-tracking branch 'origin/translation' into stable/2.18

Conflicts:
Documentation/web/server/tweets.xml
scm/define-markup-commands.scm