From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 28 Oct 2006 19:10:49 +0000 (+0200)
Subject: conflict merge.
X-Git-Tag: release/2.10.0-2~52
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=34151b33bf5a3ff37f4bd7eff54a9c9f9f57ff8d;p=lilypond.git

conflict merge.
---

diff --git a/python/convertrules.py b/python/convertrules.py
index 40a8300e73..995b2ea3b0 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2632,7 +2632,8 @@ def conv (str):
     str = re.sub (r"minimumVerticalExtent",
 		  r"\\override VerticalAxisGroup #'minimum-Y-extent",
 		  str)
-
+    str = re.sub (r"\\set ([a-zA-Z]*\.?)verticalExtent",
+		  r"\\override \1VerticalAxisGroup")
     return str
 
 conversions.append (((2, 7, 14), conv,