From: Carl Hetherington <cth@carlh.net>
Date: Sun, 7 Jan 2018 02:09:29 +0000 (+0000)
Subject: Merge.
X-Git-Tag: v2.11.39~5
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=5dbc99a98cc758c80ffa23fa00318185ccd7acc7;hp=7067754e3e21659eb89d0ba1630cfdd9323ecb0c;p=dcpomatic.git

Merge.
---

diff --git a/ChangeLog b/ChangeLog
index 37b607342..3c7e25e91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
 	* Updated nl_NL translation from Rob van Nieuwkerk.
 
+	* Version 2.11.38 released.
+
+2018-01-07  Carl Hetherington  <cth@carlh.net>
+
 	* Make certificate re-creation cancellable and default nags
 	to not going away (#1158).
 
diff --git a/debian/changelog b/debian/changelog
index 034204d15..2bc2a158f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.11.37-1) UNRELEASED; urgency=low
+dcpomatic (2.11.38-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -529,8 +529,9 @@ dcpomatic (2.11.37-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@main.carlh.net>  Sat, 06 Jan 2018 01:28:49 +0000
+ -- Carl Hetherington <carl@main.carlh.net>  Sun, 07 Jan 2018 00:38:23 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 9fb3fb733..396f82405 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.11.37devel'
+VERSION = '2.11.38devel'
 
 def options(opt):
     opt.load('compiler_cxx')