]> git.donarmstrong.com Git - lilypond.git/commitdiff
projects / lilypond.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1147504 1675830)
Merge branch 'cvs-head' of http://lilypond.org/vc/lilypond into master-hanwen
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Wed, 1 Nov 2006 16:56:52 +0000 (17:56 +0100)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Wed, 1 Nov 2006 16:56:52 +0000 (17:56 +0100)
Conflicts:

buildscripts/git-update-changelog.py

1  2 
ChangeLog patch | diff1 | diff2 | blob | history

diff --cc ChangeLog
Simple merge
Debian packaging of lilypond