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 d6ae72fb8..39ddc3b7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2015-07-17  Carl Hetherington  <cth@carlh.net>
 
+	* Version 2.1.23 released.
+
+2015-07-17  Carl Hetherington  <cth@carlh.net>
+
 	* Improve still-image filename sorting.
 
 2015-07-16  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index c0512921e..b1cceb2eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.1.22-1) UNRELEASED; urgency=low
+dcpomatic (2.1.23-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -253,8 +253,9 @@ dcpomatic (2.1.22-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Thu, 16 Jul 2015 13:42:26 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Fri, 17 Jul 2015 00:48:45 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 9c1b60865..384324fd2 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs
 
 APPNAME = 'dcpomatic'
-VERSION = '2.1.22devel'
+VERSION = '2.1.23devel'
 
 def options(opt):
     opt.load('compiler_cxx')