]> git.donarmstrong.com Git - lilypond.git/commit
Merge branch 'master' of git+ssh://hanwen@repo.or.cz/srv/git/lilypond into master...
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Mon, 30 Oct 2006 15:38:13 +0000 (16:38 +0100)
committerHan-Wen Nienhuys <lilydev@haring.localdomain>
Mon, 30 Oct 2006 15:38:13 +0000 (16:38 +0100)
commit2d6cef86cdd7e45a9383e6c3d538b0262f3a5cfd
tree0df043ce83f697999ffae7450bea4579b03b1da6
parent9977565eacebc7cab3de004c9faebdf949780ac6
parent13a8e28de140702edbb0629002073972008e17ad
Merge branch 'master' of git+ssh://hanwen@repo.or.cz/srv/git/lilypond into master-hanwen

Conflicts:

ChangeLog
stepmake/stepmake/po-vars.make
ChangeLog