]> git.donarmstrong.com Git - lilypond.git/commit
Merge branch 'cvs-head' of ssh+git://hanwen@repo.or.cz/srv/git/lilypond into master...
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Fri, 3 Nov 2006 00:54:00 +0000 (01:54 +0100)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Fri, 3 Nov 2006 00:54:00 +0000 (01:54 +0100)
commit1aa6d40d595d25202bd7b5ce82edf320845dc7a4
treea1912e0f09ee86f5f4298c30cd6a74aaea113722
parenteebbb225d648465efe472b6efe7923153cf4be1d
parent0971c8ef97eb8077e4bcd89f954a66e0cb3dcdab
Merge branch 'cvs-head' of ssh+git://hanwen@repo.or.cz/srv/git/lilypond into master-hanwen

Conflicts:

.gitignore
input/regression/utf-8.ly
input/regression/utf-8.ly