From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 28 Oct 2006 19:06:12 +0000 (+0200)
Subject: Merge branch 'origin' of /home/lilydev/vc/gub/downloads/lilypond into master-hanwen
X-Git-Tag: release/2.10.0-2~53
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6a1bde2b538e6e0feefcc6e0ae03ec9f4cc7a91b;hp=aa95fbee0a83f20112ffa88d168c7be24a7815f1;p=lilypond.git

Merge branch 'origin' of /home/lilydev/vc/gub/downloads/lilypond into master-hanwen

Conflicts:

	.gitignore
	ChangeLog
---

diff --git a/input/test/vertical-extent.ly b/input/test/vertical-extent.ly
index ae5dafe6f0..a56738e0fa 100644
--- a/input/test/vertical-extent.ly
+++ b/input/test/vertical-extent.ly
@@ -10,12 +10,12 @@ Vertical extents may increased by setting @code{\override VerticalAxisGroup #'mi
 \score {
     <<
     \new Staff {
-      \set Staff.verticalExtent = #'(-15.0 . 0.0)
+      \set Staff.VerticalAxisGroup = #'(-15.0 . 0.0)
       \clef alto
       c1
     }
     \new Staff {
-      \set Staff.verticalExtent = #'(-0.0 . 15.0)
+      \set Staff.VerticalAxisGroup = #'(-0.0 . 15.0)
       \clef alto
       g1
     }