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

diff --git a/ChangeLog b/ChangeLog
index 262273756dda112cf2174cbb31cc35189e3ffd37..869e2031ba06dc2cf1d20f0ebb73bb7df919b108 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-06  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.26 released.
+
 2013-11-05  Carl Hetherington  <cth@carlh.net>
 
        * Auto-detect encoding servers on the local

diff --git a/debian/changelog b/debian/changelog
index b9dfe68ad0d56748ce27777b493a5c28b75542ca..3dc809516dc41e54dabfbdde6a2157b18910b260 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.25-1) UNRELEASED; urgency=low
+dcpomatic (1.26-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -29,8 +29,9 @@ dcpomatic (1.25-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Mon, 04 Nov 2013 20:07:04 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Wed, 06 Nov 2013 00:11:06 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/wscript b/wscript
index 5397eda3dc5aa161313ae1e4c6998684ad01cbe9..cb473737b9852676dac6bf3c4936c34b1e3da55f 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.26pre'
+VERSION = '1.27pre'
 
 def options(opt):
     opt.load('compiler_cxx')