*** empty log message ***

diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index 8b2453b8308e947a2c5519f9d766bb54367ab0b4..2b7aeff48f580ff78412f54ca1afbad1f086a533 100644 (file)
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -5,7 +5,7 @@
 @node Top, , , 
 @top
 
-@unnumbered New features in 2.1 since 2.0
+@unnumbered New features in 2.2 since 2.0
 
 @itemize @bullet
 
@@ -346,13 +346,16 @@ attached to the lyric syllable.
 
 @item
 When redefining a context, the associated identifier is also
-updated. For example, after reading the following snippet,
+updated. For example, after reading 
+
 @example
  \translator @{
         \ScoreContext
         autoBeaming = ##f
  @}
 @end example
+
+@noindent
 the definition of @code{ScoreContext} is updated to include the changed
 setting.
 

diff --git a/VERSION b/VERSION
index c0c3e9befd67d2c45bac0e48c317dfe0304daf9d..71bf679eed3ad15d04ebe258ca692f040c64ea98 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
-MINOR_VERSION=1
-PATCH_LEVEL=37
+MINOR_VERSION=2
+PATCH_LEVEL=0
 MY_PATCH_LEVEL=
 

diff --git a/lily/lexer.ll b/lily/lexer.ll
index ad5d4e227659a0245bcfdf66b40cdedce9ec8107..af4afebe88877b74c387ef6f786cbfff37418e73 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -740,8 +740,8 @@ strip_trailing_white (String&s)
 
 
 
-/* 1.9.0 == postfix articulations */ 
-Lilypond_version oldest_version ("1.9.0");
+/* 2.1.2x something -> \property -> \set. */ 
+Lilypond_version oldest_version ("2.1.25");
 
 
 bool