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 44dffd5de..d94689652 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2018-01-09  Carl Hetherington  <cth@carlh.net>
 
+	* Version 2.11.39 released.
+
+2018-01-09  Carl Hetherington  <cth@carlh.net>
+
 	* Fix appearance controls for subtitles from DCP files (#1162).
 
 2018-01-08  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 2bc2a158f..83fadd0f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.11.38-1) UNRELEASED; urgency=low
+dcpomatic (2.11.39-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -530,8 +530,9 @@ dcpomatic (2.11.38-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@main.carlh.net>  Sun, 07 Jan 2018 00:38:23 +0000
+ -- Carl Hetherington <carl@main.carlh.net>  Tue, 09 Jan 2018 20:45:08 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 396f82405..aacd2db92 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.11.38devel'
+VERSION = '2.11.39devel'
 
 def options(opt):
     opt.load('compiler_cxx')