release commit

diff --git a/VERSION b/VERSION
index 430b6a8173da5f3582c59b9ae26996f074cbdf3c..6370030c32c2fdaa583245caa4a3818facd60590 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,8 +1,8 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
-PATCH_LEVEL=60
-MY_PATCH_LEVEL=jcn1
+PATCH_LEVEL=61
+MY_PATCH_LEVEL=
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index f4c02b2068ad713a0b063cfa9177b6006fe73689..7afd12e77cd3e275eb7c6d3be26174b5dd897925 100644 (file)
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -807,5 +807,5 @@ gets 2 note heads width (i.e. the space following a note is 1 note
 head width) A 16th note is followed by 0.5 note head width. The
 quarter note is followed by  3 NHW, the half by 4 NHW, etc.
 ",
-  "grace-space-factor spacing-increment shortest-duration-space");
+  "grace-space-factor spacing-increment base-shortest-duration shortest-duration-space");