Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index a9e415d4b..8c2f12266 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2015-10-29  Carl Hetherington  <cth@carlh.net>
 
+	* Version 2.4.15 released.
+
+2015-10-29  Carl Hetherington  <cth@carlh.net>
+
 	* Fix incorrect colours following re-scale of existing
 	DCP content (#730).
 
diff --git a/debian/changelog b/debian/changelog
index 96325298b..8bafa51f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.4.14-1) UNRELEASED; urgency=low
+dcpomatic (2.4.15-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -336,8 +336,9 @@ dcpomatic (2.4.14-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Wed, 28 Oct 2015 12:49:13 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Thu, 29 Oct 2015 18:46:23 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index eef98811c..f0649e8e0 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.4.14devel'
+VERSION = '2.4.15devel'
 
 def options(opt):
     opt.load('compiler_cxx')