]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge branch 'vertaal'
authorJan Nieuwenhuizen <janneke@gnu.org>
Sun, 24 Dec 2006 09:37:50 +0000 (10:37 +0100)
committerJan Nieuwenhuizen <janneke@gnu.org>
Sun, 24 Dec 2006 09:37:50 +0000 (10:37 +0100)
1  2 
lily/align-interface.cc
lily/lily-guile.cc
lily/music.cc
scm/lily.scm

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