]> git.donarmstrong.com Git - lilypond.git/commit
Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/lilypond
authorValentin Villenave <valentin@villenave.net>
Sun, 24 Oct 2010 12:25:06 +0000 (14:25 +0200)
committerValentin Villenave <valentin@villenave.net>
Sun, 24 Oct 2010 12:25:06 +0000 (14:25 +0200)
commit37a03b2840c04c4625515fa53772e21911098923
tree4b16bc4e0463b960dd7875d60fa180d68e207bf8
parent7a57acf2755504cfb0813ca02662ad43e7456506
parentfdfdcf5a2b54ca6dabffe609ea4b14c5c42d93a2
Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/lilypond

Conflicts:
ly/music-functions-init.ly
ly/music-functions-init.ly