From: Graham Percival <graham@percival-music.ca>
Date: Fri, 9 Feb 2007 22:50:28 +0000 (-0800)
Subject: Merge branch 'master' of ssh+git://gpercival@git.sv.gnu.org/srv/git/lilypond
X-Git-Tag: release/2.11.18-1~5^2~6
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7e8c1cafbcca145e8775b3243c8795fc8a89eb01;p=lilypond.git

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

Conflicts:

	input/lsr/connecting/Laissez-vibrer-ties.ly
	input/lsr/repeats/Volta-multi-staff.ly
	input/lsr/spacing/Page-spacing.ly
	input/lsr/spacing/Proportional-spacing.ly
	input/lsr/spacing/Proportional-strict-grace-notes.ly
	input/lsr/spacing/Proportional-strict-notespacing.ly
	input/lsr/spacing/alignment-vertical-spacing.ly
	input/lsr/staff/Staff-line-positions.ly
	input/lsr/text/font-family-override.ly
	input/lsr/vocal/Ambitus.ly
	input/lsr/vocal/lyric-combine.ly
---

7e8c1cafbcca145e8775b3243c8795fc8a89eb01