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 a7dc41226..79d05548c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2017-10-09  Carl Hetherington  <cth@carlh.net>
 
+	* Version 2.11.25 released.
+
+2017-10-09  Carl Hetherington  <cth@carlh.net>
+
 	* Updated cs_CZ translation from Tomáš Begeni.
 
 2017-10-05  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 172607886..e0c5f48d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.11.24-1) UNRELEASED; urgency=low
+dcpomatic (2.11.25-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -516,8 +516,9 @@ dcpomatic (2.11.24-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@main.carlh.net>  Sun, 01 Oct 2017 22:02:20 +0100
+ -- Carl Hetherington <carl@main.carlh.net>  Mon, 09 Oct 2017 23:25:23 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 4942c17fe..d5983e2f8 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.11.24devel'
+VERSION = '2.11.25devel'
 
 def options(opt):
     opt.load('compiler_cxx')