]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge branch 'page-break-fix'
authorJoe Neeman <joeneeman@gmail.com>
Wed, 4 Jul 2007 01:50:57 +0000 (11:50 +1000)
committerJoe Neeman <joeneeman@gmail.com>
Wed, 4 Jul 2007 01:50:57 +0000 (11:50 +1000)
Conflicts:

lily/page-breaking.cc

1  2 
lily/page-breaking.cc

Simple merge