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 3a3dffd12..f6edb0f5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-04  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.25 released.
+
 2013-10-29  Carl Hetherington  <cth@carlh.net>
 
 	* Improve performance when start-trimming
diff --git a/debian/changelog b/debian/changelog
index 229d4801a..b9dfe68ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.24-1) UNRELEASED; urgency=low
+dcpomatic (1.25-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -28,8 +28,9 @@ dcpomatic (1.24-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Mon, 28 Oct 2013 12:17:38 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Mon, 04 Nov 2013 20:07:04 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 2af209568..5397eda3d 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.25pre'
+VERSION = '1.26pre'
 
 def options(opt):
     opt.load('compiler_cxx')