Update changelog

[lilypond.git] / out / RELEASE-COMMIT

diff --git a/out/RELEASE-COMMIT b/out/RELEASE-COMMIT
index 2424106466753cd7eb84296d27ddaf7753d20856..0a3bba837699e07af8c62cbc2e38deb838847b14 100644 (file)
--- a/out/RELEASE-COMMIT
+++ b/out/RELEASE-COMMIT
@@ -1,21 +1,7 @@
-commit aef26ebc6cc020fb83c5ad6150a8be7d41f44862
+commit 753d6200e9ae51f0a98186478beff2d00d63a62b
+Merge: fc5b145 2e0077b
 Author: Phil Holmes <mail@philholmes.net>
-Date:   Sun Dec 29 16:25:45 2013 +0000
+Date:   Tue Aug 30 11:23:53 2016 +0100
 
-    Release: bump VERSION_STABLE.
+    Update release/unstable with recent changes
 
-diff --git a/VERSION b/VERSION
-index 4221957..a830836 100644
---- a/VERSION
-+++ b/VERSION
-@@ -1,7 +1,7 @@
- PACKAGE_NAME=LilyPond
- MAJOR_VERSION=2
--MINOR_VERSION=17
--PATCH_LEVEL=98
-+MINOR_VERSION=18
-+PATCH_LEVEL=0
- MY_PATCH_LEVEL=
- VERSION_STABLE=2.18.0
--VERSION_DEVEL=2.17.98
-+VERSION_DEVEL=2.17.97