]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge branch 'master' of ssh+git://jneem@git.sv.gnu.org/srv/git/lilypond
authorJoe Neeman <joeneeman@gmail.com>
Sun, 10 Dec 2006 17:59:50 +0000 (19:59 +0200)
committerJoe Neeman <joeneeman@gmail.com>
Sun, 10 Dec 2006 17:59:50 +0000 (19:59 +0200)
1  2 
lily/system.cc
scm/define-grob-properties.scm

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