]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge branch 'origin' of http://lilypond.org/vc/lilypond into master-hanwen
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Sat, 28 Oct 2006 23:14:51 +0000 (01:14 +0200)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Sat, 28 Oct 2006 23:14:51 +0000 (01:14 +0200)
Conflicts:

ChangeLog
buildscripts/git-update-changelog.py


Trivial merge