Merge.

diff --git a/ChangeLog b/ChangeLog
index 37b607342e7e0d9204ed39bfecf38dafa58986da..3c7e25e910b7fba18d245f60ad672b858632f3ff 100644 (file)
--- 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 034204d15f25342304ee3f6f446b34b81ffe5546..2bc2a158f40106e1b702f3c7e181466f626a6b9a 100644 (file)
--- 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 9fb3fb7335711f68bfa771b7755129bfd0a084c6..396f824059765e8d0a876f9bb4fb85bd32ef79a4 100644 (file)
--- 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')