]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Tue, 30 Dec 2008 02:43:14 +0000 (00:43 -0200)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Tue, 30 Dec 2008 02:43:14 +0000 (00:43 -0200)
Conflicts:
input/regression/musicxml/GNUmakefile


Trivial merge