]> 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>
Mon, 11 Aug 2008 18:20:06 +0000 (20:20 +0200)
committerReinhold Kainhofer <reinhold@kainhofer.com>
Mon, 11 Aug 2008 18:20:06 +0000 (20:20 +0200)
commit6fdeded6fa4849e55e578eaacdc11fceec7557bb
tree5b5b4d0700ed4e27784d726a2be9069cfdc3b43b
parent01423a6e8f18d5735a37cdaac940a4038aa7ac33
parent52ce56366872c05f6ddca2757aee3ed83a2d45e1
Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev/texi2html

Conflicts:

Documentation/GNUmakefile
Documentation/de/GNUmakefile
Documentation/es/GNUmakefile
Documentation/fr/GNUmakefile
make/doclang-vars.make
stepmake/stepmake/texinfo-vars.make
Documentation/GNUmakefile
make/doc-i18n-root-targets.make
make/doclang-vars.make
stepmake/stepmake/texinfo-vars.make