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 e6882ece8..4659052fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-11-20  Carl Hetherington  <cth@carlh.net>
 
+	* Version 1.31 released.
+
+2013-11-20  Carl Hetherington  <cth@carlh.net>
+
 	* Add primitive hints dialogue box.
 
 2013-11-17  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 45307a760..11630e8aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.30-1) UNRELEASED; urgency=low
+dcpomatic (1.31-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -34,8 +34,9 @@ dcpomatic (1.30-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sun, 17 Nov 2013 00:59:20 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Wed, 20 Nov 2013 16:49:09 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 70ea9ee4a..9f3741bbe 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.31pre'
+VERSION = '1.32pre'
 
 def options(opt):
     opt.load('compiler_cxx')