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

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 8eec74d4a..3e34e0bfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-09-04  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.1.52 released.
+
 2015-09-03  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.1.51 released.
diff --git a/debian/changelog b/debian/changelog
index 79f527ab4..6c3e88d26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.1.51-1) UNRELEASED; urgency=low
+dcpomatic (2.1.52-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -282,8 +282,9 @@ dcpomatic (2.1.51-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Thu, 03 Sep 2015 16:38:09 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Fri, 04 Sep 2015 10:23:30 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 80674f57d..1f39eb5ac 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs
 
 APPNAME = 'dcpomatic'
-VERSION = '2.1.51devel'
+VERSION = '2.1.52devel'
 
 def options(opt):
     opt.load('compiler_cxx')