From: Carl Hetherington <cth@carlh.net>
Date: Tue, 23 May 2017 09:03:30 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
X-Git-Tag: v2.11.7~9
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=dca38791e97ef7a60b1c9f922a1912095127559a;hp=edf8e09e1aab4fd7e0e95abfc0a1b26eddead8ae;p=dcpomatic.git

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

diff --git a/ChangeLog b/ChangeLog
index 96d13104d..b7aa13b94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-05-23  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.11.6 released.
+
 2017-05-16  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.11.5 released.
diff --git a/debian/changelog b/debian/changelog
index f4f76ff12..9dc53031e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.11.5-1) UNRELEASED; urgency=low
+dcpomatic (2.11.6-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -493,8 +493,9 @@ dcpomatic (2.11.5-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@main.carlh.net>  Tue, 16 May 2017 09:08:53 +0100
+ -- Carl Hetherington <carl@main.carlh.net>  Tue, 23 May 2017 09:44:58 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 00285a9b2..1fe4bcec8 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.11.5devel'
+VERSION = '2.11.6devel'
 
 def options(opt):
     opt.load('compiler_cxx')