From: Carl Hetherington <cth@carlh.net>
Date: Thu, 14 Dec 2017 19:39:07 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
X-Git-Tag: v2.11.30~10
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=f76de68a78b2924f61c299a039336bbd50f8adc9;hp=45c410c9ae0b1627d5b169646931d623d1cb0f8c

Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
---

diff --git a/ChangeLog b/ChangeLog
index df503a3aa..2dd2a0c67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-12-13  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.11.29 released.
+
 2017-12-13  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.11.28 released.
diff --git a/debian/changelog b/debian/changelog
index 3b7501dde..c4109a3ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.11.28-1) UNRELEASED; urgency=low
+dcpomatic (2.11.29-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -520,8 +520,9 @@ dcpomatic (2.11.28-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@main.carlh.net>  Wed, 13 Dec 2017 10:31:46 +0000
+ -- Carl Hetherington <carl@main.carlh.net>  Wed, 13 Dec 2017 22:05:11 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 1bd5a0570..30d6fb8d6 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.11.28devel'
+VERSION = '2.11.29devel'
 
 def options(opt):
     opt.load('compiler_cxx')