*** empty log message ***

diff --git a/VERSION b/VERSION
index b5127802c36f3313917dea9a175659ecc04f9c53..819f53c1534ab2e08877485f7bcc48f758ac79a1 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=1
-PATCH_LEVEL=31
-MY_PATCH_LEVEL=hwn1
+PATCH_LEVEL=32
+MY_PATCH_LEVEL=
 

diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh
index 44cf1fcaab5cafc527e4cdda93722de9c3fdb207..d466eee89f3c782d624ef8306e8a07223e9478a2 100644 (file)
--- a/flower/include/virtual-methods.hh
+++ b/flower/include/virtual-methods.hh
@@ -25,8 +25,6 @@ demangle_classname (std::type_info const &);
       VIRTUAL_COPY_CONSTRUCTOR (Baseclass, Foo);
    }; */
 
-Base *clone () const { return new Name (*this); }
-
 #define VIRTUAL_COPY_CONSTRUCTOR(base, name) \
   /* Hack to fix constness: gcc >= 2.95 is correct in defining \
      typeof (*this) in a const member function to be const.  */ \

diff --git a/input/test/header-ifelse.ly b/input/test/header-ifelse.ly
index 52bb9884fb1c63449b8fdb4b284ad1138e9ced29..bab5d1e22a32de3bdf63d75e5e9ae1052ecf3153 100644 (file)
--- a/input/test/header-ifelse.ly
+++ b/input/test/header-ifelse.ly
@@ -5,8 +5,9 @@
   (define pieceTagLine (string-append "Jeremie " (lilypond-version) " was here")))
 
 \header{
-tagline = \pieceTagLine
-texidoc = "
+
+    tagline = \pieceTagLine
+    texidoc = "
 
 High level functionality (eg. conditional defines),
 can be accomplished with GUILE.

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index aa549f9590b2e1f3b778e04ff750f9d7186b3744..d9aad2c9def1a19840ee5b7fb8fe7a7a4067a11c 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -270,7 +270,7 @@ typedef SCM (*Scheme_function_3) (...);
 
 /*
   Adds the NAME as a Scheme function, and a variable to store the SCM
-  version of the function.
+  version of the function in the static variable NAME_proc
  */
 #define DECLARE_SCHEME_CALLBACK(NAME,ARGS) \
        static SCM NAME ARGS; \