]> 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>
Sun, 24 Dec 2006 15:23:17 +0000 (16:23 +0100)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Sun, 24 Dec 2006 15:23:17 +0000 (16:23 +0100)
1  2 
lily/music.cc
scm/define-grob-interfaces.scm

diff --cc lily/music.cc
Simple merge
Simple merge