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 ed1fb77a9..24275a2c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-08-26  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.9.17 released.
+
 2016-08-25  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.9.16 released.
diff --git a/debian/changelog b/debian/changelog
index 061fb4c8b..d213cfd30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.9.16-1) UNRELEASED; urgency=low
+dcpomatic (2.9.17-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -454,8 +454,9 @@ dcpomatic (2.9.16-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Thu, 25 Aug 2016 19:37:11 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Fri, 26 Aug 2016 10:27:41 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index e86931fd1..b6adcc395 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.9.16devel'
+VERSION = '2.9.17devel'
 
 def options(opt):
     opt.load('compiler_cxx')