Merge branch '1.0' of ssh://carlh.dyndns.org/home/carl/git/dvdomatic into 1.0

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index b245dfc85..dd217c37e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-27  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.35 released.
+
 2013-11-26  Carl Hetherington  <cth@carlh.net>
 
 	* Updated fr_FR translation from Lilian Lefranc.
diff --git a/debian/changelog b/debian/changelog
index fd971efe3..6b220e982 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.34-1) UNRELEASED; urgency=low
+dcpomatic (1.35-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -38,8 +38,9 @@ dcpomatic (1.34-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Fri, 22 Nov 2013 23:07:30 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Wed, 27 Nov 2013 14:57:48 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 029bedf1e..5f6238b37 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.35pre'
+VERSION = '1.36pre'
 
 def options(opt):
     opt.load('compiler_cxx')