From: Phil Holmes <mail@philholmes.net>
Date: Mon, 2 May 2016 08:21:48 +0000 (+0100)
Subject: Merge remote branch 'origin/release/unstable' into HEAD
X-Git-Tag: release/2.19.42-1~19^2~5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bf5e12cca7be0cf62014de7186dffaebbee13bfa;hp=d773074cfc3eb6dd93664ac15d60c5dfa902a576;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 ccd09c884f..e7c6d228db 100644
--- a/Documentation/web/news-front.itexi
+++ b/Documentation/web/news-front.itexi
@@ -9,10 +9,10 @@
 @c used for news about the upcoming release; see CG 10.2
 
 @newsItem
-@subheading LilyPond 2.19.40 released  @emph{April 17, 2016}
+@subheading LilyPond 2.19.41 released  @emph{May 1, 2016}
 
 We are happy to announce the release of LilyPond
-2.19.40.  This release includes a number of enhancements, and contains some
+2.19.41.  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
diff --git a/Documentation/web/news.itexi b/Documentation/web/news.itexi
index dabfc79144..9095620830 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
+@subheading LilyPond 2.19.40 released  @emph{April 17, 2016}
+
+We are happy to announce the release of LilyPond
+2.19.40.  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
 @subheading LilyPond 2.19.39 released  @emph{March 27, 2016}
 
diff --git a/VERSION b/VERSION
index b71387ae8b..08b3f54400 100644
--- a/VERSION
+++ b/VERSION
@@ -4,4 +4,4 @@ MINOR_VERSION=19
 PATCH_LEVEL=41
 MY_PATCH_LEVEL=
 VERSION_STABLE=2.18.2
-VERSION_DEVEL=2.19.40
+VERSION_DEVEL=2.19.41
diff --git a/ly/Welcome-to-LilyPond-MacOS.ly b/ly/Welcome-to-LilyPond-MacOS.ly
index 7381ab5caa..87ae51855d 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.40"  % necessary for upgrading to future LilyPond versions.
+\version "2.19.41"  % 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 6225500a8f..526bb56eb4 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.40"  % necessary for upgrading to future LilyPond versions.
+\version "2.19.41"  % necessary for upgrading to future LilyPond versions.
 
 \header{
   title = "A scale in LilyPond"
diff --git a/po/lilypond.pot b/po/lilypond.pot
index 45f8d4c26b..a55d9d3bb0 100644
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: lilypond 2.19.40\n"
+"Project-Id-Version: lilypond 2.19.41\n"
 "Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu."
 "lilypond.bugs\n"
-"POT-Creation-Date: 2016-04-17 12:02+0100\n"
+"POT-Creation-Date: 2016-05-01 12: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"
@@ -3536,7 +3536,7 @@ msgstr ""
 msgid "do not know how to embed font ~s ~s ~s"
 msgstr ""
 
-#: framework-ps.scm:751
+#: framework-ps.scm:754
 msgid ""
 "\n"
 "The PostScript backend does not support the\n"