]> git.donarmstrong.com Git - lilypond.git/commit - lily/simple-spacer.cc
Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond into...
authorTill Paala <till.rettig@gmx.de>
Fri, 29 Jan 2010 20:18:39 +0000 (22:18 +0200)
committerTill Paala <till.rettig@gmx.de>
Fri, 29 Jan 2010 20:18:39 +0000 (22:18 +0200)
commite18531db1f79fb685fbd16d6a2a67bf4b6c09915
tree74e54e8d84c5d282d28b1938cde2f0a317e13122
parent4b486387b7fb63db1c962e1590f7e248c11dd0ac
parentbc95f4434f760d41191341ab4508b2064eb19025
Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond into lilypond/translation

Conflicts:
Documentation/de/learning.tely
Documentation/de/learning.tely
Documentation/de/notation.tely
Documentation/de/usage.tely