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 90db8d70e..05d29803a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-01-05  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.11.36 released.
+
 2018-01-04  Carl Hetherington  <cth@carlh.net>
 
 	* Put up a token (unspecific) progress bar during import
diff --git a/debian/changelog b/debian/changelog
index 94fe667cb..af9254b9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.11.35-1) UNRELEASED; urgency=low
+dcpomatic (2.11.36-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -527,8 +527,9 @@ dcpomatic (2.11.35-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@main.carlh.net>  Wed, 03 Jan 2018 15:50:23 +0000
+ -- Carl Hetherington <carl@main.carlh.net>  Fri, 05 Jan 2018 13:53:45 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 1bb72b6f5..d25ec471e 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.11.35devel'
+VERSION = '2.11.36devel'
 
 def options(opt):
     opt.load('compiler_cxx')