Merge http://git.sv.gnu.org/r/lilypond

author Nicolas Sceaux <nicolas.sceaux@free.fr>

Mon, 22 Jan 2007 21:14:50 +0000 (22:14 +0100)

committer Nicolas Sceaux <nicolas.sceaux@free.fr>

Mon, 22 Jan 2007 21:14:50 +0000 (22:14 +0100)
author Nicolas Sceaux <nicolas.sceaux@free.fr>
Mon, 22 Jan 2007 21:14:50 +0000 (22:14 +0100)
committer Nicolas Sceaux <nicolas.sceaux@free.fr>
Mon, 22 Jan 2007 21:14:50 +0000 (22:14 +0100)
diff --cc ly/music-functions-init.ly
Simple merge
diff --cc scm/music-functions.scm
Simple merge
author	Nicolas Sceaux <nicolas.sceaux@free.fr>
	Mon, 22 Jan 2007 21:14:50 +0000 (22:14 +0100)
committer	Nicolas Sceaux <nicolas.sceaux@free.fr>
	Mon, 22 Jan 2007 21:14:50 +0000 (22:14 +0100)
		1	2
ly/music-functions-init.ly	patch \|	diff1 \|	diff2 \|	blob \| history
scm/music-functions.scm	patch \|	diff1 \|	diff2 \|	blob \| history