]> 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>
Fri, 9 May 2008 17:00:26 +0000 (19:00 +0200)
committerReinhold Kainhofer <reinhold@kainhofer.com>
Fri, 9 May 2008 17:00:26 +0000 (19:00 +0200)
commit9d9e2e5637e06d98245c3395b58207ec173e7e7d
tree1aa26498e5defef8537d950d0eeb104321731052
parent881e13a10014af4ad380a0e71696971198c20218
parent53b1b7d4de672d28cba0dda1ba0618ebfb4f730a
Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev/texi2html

Conflicts:

buildscripts/html-gettext.py
buildscripts/www_post.py
input/lsr/editorial-and-educational-use-intro.itely
make/doclang-rules.make
python/langdefs.py
stepmake/stepmake/texinfo-rules.make
buildscripts/add_html_footer.py
buildscripts/html-gettext.py
buildscripts/www_post.py
input/lsr/lilypond-snippets.tely
make/doclang-rules.make
scm/documentation-generate.scm
scm/documentation-lib.scm
stepmake/stepmake/texinfo-rules.make