Cherry-pick 6a73776004 with minor adaptions in d/control and d/rules

[lilypond.git] / out / RELEASE-COMMIT

diff --git a/out/RELEASE-COMMIT b/out/RELEASE-COMMIT
index 0a3bba837699e07af8c62cbc2e38deb838847b14..788da860bee28f81eeccee318f37dd8388aeacc2 100644 (file)
--- a/out/RELEASE-COMMIT
+++ b/out/RELEASE-COMMIT
@@ -1,7 +1,32 @@
-commit 753d6200e9ae51f0a98186478beff2d00d63a62b
-Merge: fc5b145 2e0077b
+commit 97a0169312a260933246ab224e4f8b0969871dd5
 Author: Phil Holmes <mail@philholmes.net>
-Date:   Tue Aug 30 11:23:53 2016 +0100
+Date:   Sun Aug 6 11:21:05 2017 +0100
 
-    Update release/unstable with recent changes
+    Release: bump Welcome versions.
 
+diff --git a/ly/Welcome-to-LilyPond-MacOS.ly b/ly/Welcome-to-LilyPond-MacOS.ly
+index d928d6d..01c9490 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.64"  % necessary for upgrading to future LilyPond versions.
++\version "2.19.65"  % 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 77029e7..a55f74c 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.64"  % necessary for upgrading to future LilyPond versions.
++\version "2.19.65"  % necessary for upgrading to future LilyPond versions.
+ 
+ \header{
+   title = "A scale in LilyPond"