]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge with master
authorJoe Neeman <joeneeman@gmail.com>
Thu, 18 Jan 2007 20:28:05 +0000 (22:28 +0200)
committerJoe Neeman <joeneeman@gmail.com>
Thu, 18 Jan 2007 20:28:05 +0000 (22:28 +0200)
1  2 
lily/main.cc
scm/lily.scm

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