]> git.donarmstrong.com Git - lilypond.git/commit
Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev...
authorReinhold Kainhofer <reinhold@kainhofer.com>
Sun, 17 Aug 2008 15:50:57 +0000 (17:50 +0200)
committerReinhold Kainhofer <reinhold@kainhofer.com>
Sun, 17 Aug 2008 15:50:57 +0000 (17:50 +0200)
commit4cf1c1f0def359889bf9dc326cd6f7ec6edceecd
treee86d6fe9b54b27d68c7eadf4294250b5efeb9c20
parentea12891c7929490e664bfb587fc19eb27cab6170
parent9ddb926d01938067b665f0085ee882ded31e028a
Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev/texi2html

Conflicts:

Documentation/user/macros.itexi
buildscripts/add_html_footer.py
stepmake/stepmake/generic-targets.make
Documentation/user/macros.itexi
buildscripts/add_html_footer.py
stepmake/stepmake/generic-targets.make