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 3b637533f..42d7e92db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-07-04  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.8.18 released.
+
 2016-07-04  c.hetherington  <cth@carlh.net>
 
 	* Fix several bugs with the sensitivity
diff --git a/debian/changelog b/debian/changelog
index faa35405f..395f9e979 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.8.17-1) UNRELEASED; urgency=low
+dcpomatic (2.8.18-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -434,8 +434,9 @@ dcpomatic (2.8.17-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sun, 03 Jul 2016 23:24:55 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Mon, 04 Jul 2016 23:55:02 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 317c87ab2..e16f6aefa 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.8.17devel'
+VERSION = '2.8.18devel'
 
 def options(opt):
     opt.load('compiler_cxx')