Merge.

3 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index b8ff404f5..f9433517e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* Updated pt_BR translation from Max Fuhlendorf.
 
+	* Version 2.11.42 released.
+
 2018-01-14  Carl Hetherington  <cth@carlh.net>
 
 	* Updated nl_NL translation from Rob van Nieuwkerk.
diff --git a/debian/changelog b/debian/changelog
index 77a0b1ccb..0d4ba1083 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.11.41-1) UNRELEASED; urgency=low
+dcpomatic (2.11.42-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -533,8 +533,9 @@ dcpomatic (2.11.41-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@main.carlh.net>  Sun, 14 Jan 2018 02:28:34 +0000
+ -- Carl Hetherington <carl@main.carlh.net>  Mon, 15 Jan 2018 01:57:17 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 9877aed89..f821d2d93 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.11.41devel'
+VERSION = '2.11.42devel'
 
 def options(opt):
     opt.load('compiler_cxx')