Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 64cc32926..f88d29d56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-08-29  Carl Hetherington  <cth@carlh.net>
 
+	* Version 1.01beta1 released.
+
+2013-08-29  Carl Hetherington  <cth@carlh.net>
+
 	* Fix emissions of large chunks of silence when
 	analysing audio in some cases.
 
diff --git a/debian/changelog b/debian/changelog
index 9100198e9..e2ff671a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-dcpomatic (1.00-1) UNRELEASED; urgency=low
+dcpomatic (1.01beta1-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Wed, 28 Aug 2013 17:05:38 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Thu, 29 Aug 2013 12:44:03 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index df2b1c1d5..915b41d24 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.01pre'
+VERSION = '1.01beta1'
 
 def options(opt):
     opt.load('compiler_cxx')