projects / lilypond.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f4ab2d 80b2f1d)
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)
Conflicts:
Documentation/web/server/tweets.xml

1  2 
scm/define-markup-commands.scm patch | diff1 | diff2 | blob | history

diff --cc scm/define-markup-commands.scm
Simple merge
Debian packaging of lilypond