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

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 6880b0d0d..3441485d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2015-10-06  Carl Hetherington  <cth@carlh.net>
 
+	* Version 2.4.2 released.
+
+2015-10-06  Carl Hetherington  <cth@carlh.net>
+
 	* Fix subtitle timing when the DCP rate
 	is different to their native rate.
 
diff --git a/debian/changelog b/debian/changelog
index 76c9b512f..f992275f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.4.1-1) UNRELEASED; urgency=low
+dcpomatic (2.4.2-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -323,8 +323,9 @@ dcpomatic (2.4.1-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Tue, 06 Oct 2015 09:21:49 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Tue, 06 Oct 2015 16:31:58 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 2d7116c7a..068a2263f 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs
 
 APPNAME = 'dcpomatic'
-VERSION = '2.4.1devel'
+VERSION = '2.4.2devel'
 
 def options(opt):
     opt.load('compiler_cxx')