Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0

4 files changed, 17 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 09c77182c..058a356ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2014-12-11  Carl Hetherington  <cth@carlh.net>
 
+	* Version 2.0.24 released.
+
+2014-12-11  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.23 released.
+
+2014-12-11  Carl Hetherington  <cth@carlh.net>
+
 	* Add a language property to subtitle content and use it
 	for the DCP subtitle's language specification.
 
diff --git a/debian/changelog b/debian/changelog
index 63e27c6dc..b9eb372af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.0.22-1) UNRELEASED; urgency=low
+dcpomatic (2.0.24-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -201,8 +201,10 @@ dcpomatic (2.0.22-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Mon, 24 Nov 2014 11:19:58 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Thu, 11 Dec 2014 22:57:22 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 27f029d9b..1a05ed2cb 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -63,6 +63,10 @@
 #include <iostream>
 #include <fstream>
 
+#ifdef check
+#undef check
+#endif
+
 using std::cout;
 using std::string;
 using std::vector;
diff --git a/wscript b/wscript
index f276e4d16..40ef15f86 100644
--- a/wscript
+++ b/wscript
@@ -5,7 +5,7 @@ import distutils
 import distutils.spawn
 
 APPNAME = 'dcpomatic'
-VERSION = '2.0.22devel'
+VERSION = '2.0.24devel'
 
 def options(opt):
     opt.load('compiler_cxx')