From: Phil Holmes <mail@philholmes.net>
Date: Mon, 26 May 2014 13:15:25 +0000 (+0100)
Subject: Merge remote branch 'origin/release/unstable' into HEAD
X-Git-Tag: release/2.19.8-1~22
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4a34b458c4ebc72d515ab9c5b90eb0abfeeda196;hp=366316fd6be846c2050be6b1b3955b261026187e;p=lilypond.git

Merge remote branch 'origin/release/unstable' into HEAD
---

diff --git a/Documentation/web/news-front.itexi b/Documentation/web/news-front.itexi
index 1a6b0b5aa3..cf90dd5033 100644
--- a/Documentation/web/news-front.itexi
+++ b/Documentation/web/news-front.itexi
@@ -9,9 +9,9 @@
 @c used for news about the upcoming release; see CG 10.2
 
 @newsItem
-@subsubheading LilyPond 2.19.6 released  @emph{May 11, 2014}
+@subsubheading LilyPond 2.19.7 released  @emph{May 25, 2014}
 
-We are happy to announce the release of LilyPond 2.19.6.  This
+We are happy to announce the release of LilyPond 2.19.7.  This
 release includes a number of enhancements, and contains some work
 in progress.  You will have access to the very latest features, but
 some may be incomplete, and you may encounter bugs and crashes.  If you
diff --git a/Documentation/web/news.itexi b/Documentation/web/news.itexi
index a9d369a965..77d27cb7da 100644
--- a/Documentation/web/news.itexi
+++ b/Documentation/web/news.itexi
@@ -26,6 +26,18 @@ NOTE:
   * don't duplicate entries from news-front.itexi
 @end ignore
 
+@newsItem
+@subsubheading LilyPond 2.19.6 released  @emph{May 11, 2014}
+
+We are happy to announce the release of LilyPond 2.19.6.  This
+release includes a number of enhancements, and contains some work
+in progress.  You will have access to the very latest features, but
+some may be incomplete, and you may encounter bugs and crashes.  If you
+require a stable version of Lilypond, we recommend using the 2.18
+version.
+
+@newsEnd
+
 @newsItem
 @subsubheading LilyPond 2.19.5 released  @emph{April 20, 2014}
 
diff --git a/VERSION b/VERSION
index 87c1fedaa4..794ab71e2a 100644
--- a/VERSION
+++ b/VERSION
@@ -4,4 +4,4 @@ MINOR_VERSION=19
 PATCH_LEVEL=7
 MY_PATCH_LEVEL=
 VERSION_STABLE=2.18.2
-VERSION_DEVEL=2.19.6
+VERSION_DEVEL=2.19.7
diff --git a/ly/Welcome-to-LilyPond-MacOS.ly b/ly/Welcome-to-LilyPond-MacOS.ly
index 09dad36cdb..3981e0334b 100644
--- a/ly/Welcome-to-LilyPond-MacOS.ly
+++ b/ly/Welcome-to-LilyPond-MacOS.ly
@@ -23,7 +23,7 @@ That's it.  For more information, visit http://lilypond.org .
 
 %}
 
-\version "2.19.6"  % necessary for upgrading to future LilyPond versions.
+\version "2.19.7"  % necessary for upgrading to future LilyPond versions.
 
 \header{
   title = "A scale in LilyPond"
diff --git a/ly/Welcome_to_LilyPond.ly b/ly/Welcome_to_LilyPond.ly
index 94125c5e1f..17830c629d 100644
--- a/ly/Welcome_to_LilyPond.ly
+++ b/ly/Welcome_to_LilyPond.ly
@@ -32,7 +32,7 @@ Good luck with LilyPond!  Happy engraving.
 
 %}
 
-\version "2.19.6"  % necessary for upgrading to future LilyPond versions.
+\version "2.19.7"  % necessary for upgrading to future LilyPond versions.
 
 \header{
   title = "A scale in LilyPond"
diff --git a/po/lilypond.pot b/po/lilypond.pot
index 52b55c70fb..68ea17ecc6 100644
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: lilypond 2.19.6\n"
+"Project-Id-Version: lilypond 2.19.7\n"
 "Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu."
 "lilypond.bugs\n"
-"POT-Creation-Date: 2014-05-11 15:59+0100\n"
+"POT-Creation-Date: 2014-05-25 15:41+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3736,21 +3736,21 @@ msgstr ""
 msgid "Add @var{octave-shift} to the octave of @var{pitch}."
 msgstr ""
 
-#: music-functions.scm:1445
+#: music-functions.scm:1446
 #, scheme-format
 msgid "Unknown octaveness type: ~S "
 msgstr ""
 
-#: music-functions.scm:1446
+#: music-functions.scm:1447
 msgid "Defaulting to 'any-octave."
 msgstr ""
 
-#: music-functions.scm:1832
+#: music-functions.scm:1833
 #, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr ""
 
-#: music-functions.scm:2050
+#: music-functions.scm:2051
 msgid "Missing duration"
 msgstr ""