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 ae5dafe6f0249a14f20b44526eadc22999e56780..a56738e0fa4cab4f30079dbc187fcdb863d5529d 100644 (file)
--- 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
     }