]> git.donarmstrong.com Git - lilypond.git/commit - Documentation/user/staff.itely
Merge branch 'master' into dev/texi2html
authorReinhold Kainhofer <reinhold@kainhofer.com>
Fri, 29 Aug 2008 19:11:07 +0000 (21:11 +0200)
committerReinhold Kainhofer <reinhold@kainhofer.com>
Fri, 29 Aug 2008 19:11:07 +0000 (21:11 +0200)
commit40b08aca291b101bcab28ce68088935a0ad07fe2
tree688ca65b93d432ee7bc3d74fbd11a3b89e97791c
parentb3d101abf89f881f82ce6b15005888c064c24b7d
parent4016dc1ba57e10009847f29faf2121f8145b4f12
Merge branch 'master' into dev/texi2html

Conflicts:

stepmake/stepmake/texinfo-vars.make
Documentation/user/GNUmakefile
GNUmakefile.in
stepmake/stepmake/generic-targets.make
stepmake/stepmake/texinfo-rules.make
stepmake/stepmake/texinfo-targets.make
stepmake/stepmake/texinfo-vars.make