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

author Joe Neeman <joeneeman@gmail.com>

Thu, 11 Dec 2008 20:45:33 +0000 (12:45 -0800)

committer Joe Neeman <joeneeman@gmail.com>

Thu, 11 Dec 2008 20:45:33 +0000 (12:45 -0800)
author Joe Neeman <joeneeman@gmail.com>
Thu, 11 Dec 2008 20:45:33 +0000 (12:45 -0800)
committer Joe Neeman <joeneeman@gmail.com>
Thu, 11 Dec 2008 20:45:33 +0000 (12:45 -0800)
diff --cc lily/include/paper-column.hh
Simple merge
diff --cc lily/paper-column.cc
Simple merge
diff --cc lily/separation-item.cc
Simple merge
diff --cc lily/spacing-spanner.cc
Simple merge
author	Joe Neeman <joeneeman@gmail.com>
	Thu, 11 Dec 2008 20:45:33 +0000 (12:45 -0800)
committer	Joe Neeman <joeneeman@gmail.com>
	Thu, 11 Dec 2008 20:45:33 +0000 (12:45 -0800)
		1	2
lily/include/paper-column.hh	patch \|	diff1 \|	diff2 \|	blob \| history
lily/paper-column.cc	patch \|	diff1 \|	diff2 \|	blob \| history
lily/separation-item.cc	patch \|	diff1 \|	diff2 \|	blob \| history
lily/spacing-spanner.cc	patch \|	diff1 \|	diff2 \|	blob \| history