Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

author Han-Wen Nienhuys <hanwen@xs4all.nl>

Wed, 7 Feb 2007 19:32:07 +0000 (20:32 +0100)

committer Han-Wen Nienhuys <hanwen@xs4all.nl>

Wed, 7 Feb 2007 19:32:07 +0000 (20:32 +0100)
author Han-Wen Nienhuys <hanwen@xs4all.nl>
Wed, 7 Feb 2007 19:32:07 +0000 (20:32 +0100)
committer Han-Wen Nienhuys <hanwen@xs4all.nl>
Wed, 7 Feb 2007 19:32:07 +0000 (20:32 +0100)
diff --cc Documentation/topdocs/NEWS.tely
Simple merge
diff --cc Documentation/user/running.itely
Simple merge
diff --cc scm/define-grobs.scm
Simple merge
author	Han-Wen Nienhuys <hanwen@xs4all.nl>
	Wed, 7 Feb 2007 19:32:07 +0000 (20:32 +0100)
committer	Han-Wen Nienhuys <hanwen@xs4all.nl>
	Wed, 7 Feb 2007 19:32:07 +0000 (20:32 +0100)
		1	2
Documentation/topdocs/NEWS.tely	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/user/running.itely	patch \|	diff1 \|	diff2 \|	blob \| history
scm/define-grobs.scm	patch \|	diff1 \|	diff2 \|	blob \| history