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

author Phil Holmes <mail@philholmes.net>

Mon, 6 Jan 2014 13:36:08 +0000 (13:36 +0000)

committer Phil Holmes <mail@philholmes.net>

Mon, 6 Jan 2014 13:36:08 +0000 (13:36 +0000)
author Phil Holmes <mail@philholmes.net>
Mon, 6 Jan 2014 13:36:08 +0000 (13:36 +0000)
committer Phil Holmes <mail@philholmes.net>
Mon, 6 Jan 2014 13:36:08 +0000 (13:36 +0000)
diff --cc VERSION

index 5bff3796c5463156e9cd484c0993e1d0fca076a2,0c08f632beb21d0fd206f66dfbf61601adb40d32..b00c8a267df464148c29d7ccacde4dc613790290
--- 1/VERSION
--- 2/VERSION
+++ b/VERSION
@@@ -1,7 -1,7 +1,7 @@@
   PACKAGE_NAME=LilyPond
   MAJOR_VERSION=2
   MINOR_VERSION=19
- -PATCH_LEVEL=0
+ +PATCH_LEVEL=1
   MY_PATCH_LEVEL=
   VERSION_STABLE=2.18.0
- VERSION_DEVEL=2.17.97
+ VERSION_DEVEL=2.19.0
diff --cc po/lilypond.pot
Simple merge
author	Phil Holmes <mail@philholmes.net>
	Mon, 6 Jan 2014 13:36:08 +0000 (13:36 +0000)
committer	Phil Holmes <mail@philholmes.net>
	Mon, 6 Jan 2014 13:36:08 +0000 (13:36 +0000)
		1	2
VERSION	patch \|	diff1 \|	diff2 \|	blob \| history
po/lilypond.pot	patch \|	diff1 \|	diff2 \|	blob \| history