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 b81fc19a5..a9af721eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-09-26  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.3.6 released.
+
 2015-09-25  Carl Hetherington  <cth@carlh.net>
 
 	* Fix assertion failure when loading .MTS files (#702).
diff --git a/debian/changelog b/debian/changelog
index 4cb7d9714..5d06eb766 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.3.5-1) UNRELEASED; urgency=low
+dcpomatic (2.3.6-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -312,8 +312,9 @@ dcpomatic (2.3.5-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Mon, 21 Sep 2015 12:26:01 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Sat, 26 Sep 2015 14:43:58 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index fd2830a98..0c08e499e 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs
 
 APPNAME = 'dcpomatic'
-VERSION = '2.3.5devel'
+VERSION = '2.3.6devel'
 
 def options(opt):
     opt.load('compiler_cxx')