Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

diff --git a/ChangeLog b/ChangeLog
index 7c0e06dcaeee9eb28db038858605154e7f66bcff..bda7699ce42fb242ffb79a482f249e43cfdf31ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-11  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.0.29 released.
+
 2015-01-11  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.0.28 released.

diff --git a/debian/changelog b/debian/changelog
index da9479034f7a42454b0c0a3eae2e07d52e9785f9..9fe57b529809039b6979bf59c5384d11d802cb1e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.0.28-1) UNRELEASED; urgency=low
+dcpomatic (2.0.29-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -207,8 +207,9 @@ dcpomatic (2.0.28-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sun, 11 Jan 2015 20:38:57 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Sun, 11 Jan 2015 22:19:17 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/wscript b/wscript
index d87ae0bf8494eb40c38b4740bf8291415d49b69e..0f21d32269612dcc022b9502a8980dffddc8fd51 100644 (file)
--- a/wscript
+++ b/wscript
@@ -5,7 +5,7 @@ import distutils
 import distutils.spawn
 
 APPNAME = 'dcpomatic'
-VERSION = '2.0.28devel'
+VERSION = '2.0.29devel'
 
 def options(opt):
     opt.load('compiler_cxx')