Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index ad48437c1..e5b575991 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-06-25  Carl Hetherington  <cth@carlh.net>
 
+	* Version 1.69.36 released.
+
+2014-06-25  Carl Hetherington  <cth@carlh.net>
+
 	* Support pixel format 46 in make_black().
 
 2014-06-24  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 0470cab2b..04b503466 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.69.35-1) UNRELEASED; urgency=low
+dcpomatic (1.69.36-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -159,8 +159,9 @@ dcpomatic (1.69.35-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sun, 22 Jun 2014 21:49:09 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Wed, 25 Jun 2014 22:13:36 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 92250a50c..d8e4cf036 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.69.35devel'
+VERSION = '1.69.36devel'
 
 def options(opt):
     opt.load('compiler_cxx')