]> 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, 18 Apr 2008 09:32:36 +0000 (11:32 +0200)
committerReinhold Kainhofer <reinhold@kainhofer.com>
Fri, 18 Apr 2008 09:32:36 +0000 (11:32 +0200)
commitb567811cb0fa5a805aabb9e8fb903763c13e8c29
treee784237b4bfbb05ed79e3103c2f05667654da53a
parentf96e38fbbbfba9cf4729323beb518a65ae77d562
parent58d7b40d1152b001d5700d14f32a2a7701c82799
Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev/texi2html

Conflicts:

buildscripts/add_html_footer.py
input/lsr/guitar-intro.itely
input/lsr/piano-music-intro.itely
input/lsr/strings-intro.itely
make/doclang-rules.make
make/doclang-vars.make
stepmake/stepmake/texinfo-rules.make
buildscripts/add_html_footer.py
input/lsr/GNUmakefile
input/lsr/lilypond-snippets.tely
make/doclang-rules.make
stepmake/stepmake/texinfo-rules.make