From: Carl Hetherington <cth@carlh.net>
Date: Sun, 11 Jan 2015 22:59:59 +0000 (+0000)
Subject: Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
X-Git-Tag: v2.0.48~314
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=fae6eb8054d556adf03674d40cade4d8656ab1c1;hp=fbc0f098149febf822e4e53d6026120e6a273be8

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

diff --git a/ChangeLog b/ChangeLog
index 7c0e06dca..bda7699ce 100644
--- 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 da9479034..9fe57b529 100644
--- 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 d87ae0bf8..0f21d3226 100644
--- 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')