]> git.donarmstrong.com Git - lilypond.git/commit
Merge branch 'cvs-head' of http://lilypond.org/vc/lilypond into master-hanwen
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Fri, 3 Nov 2006 01:47:13 +0000 (02:47 +0100)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Fri, 3 Nov 2006 01:47:13 +0000 (02:47 +0100)
commitb89ed23afd3df22f7160ac798ed185f42cb173b2
tree31847aec79a46d99ecf91a28bf0505d8021bdbb2
parent1b6f779f88527554d495c2bc58c9e3b6b9862925
parentbd2db986b410591905f89552af5df579dfc1b9fc
Merge branch 'cvs-head' of http://lilypond.org/vc/lilypond into master-hanwen

Conflicts:

.gitignore
scm/lily.scm
ChangeLog
scm/lily.scm