Merge branch 'v2.12.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.12.x

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 1eb2757cf..61118085a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2018-02-25  Carl Hetherington  <cth@carlh.net>
 
+	* Version 2.11.63 released.
+
+2018-02-25  Carl Hetherington  <cth@carlh.net>
+
 	* Handle errors in subtitle XML better (#1209).
 
 2018-02-24  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index ec23db453..455c757ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.11.62-1) UNRELEASED; urgency=low
+dcpomatic (2.11.63-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -554,8 +554,9 @@ dcpomatic (2.11.62-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@main.carlh.net>  Sat, 24 Feb 2018 01:07:23 +0000
+ -- Carl Hetherington <carl@main.carlh.net>  Sun, 25 Feb 2018 00:54:16 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index c383e1871..7bcae05d4 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.11.62devel'
+VERSION = '2.11.63devel'
 
 def options(opt):
     opt.load('compiler_cxx')