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

diff --git a/ChangeLog b/ChangeLog
index 73d8242ee349e018b59f55593b6e60effe6a7f63..4795375d867a8f6a89563509c5939c10593418b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-08-04  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.9.9 released.
+
 2016-08-04  Carl Hetherington  <cth@carlh.net>
 
        * Add button to export entire DCP decryption chain.

diff --git a/debian/changelog b/debian/changelog
index 37d135f238ff263281cfd554680e396bbb584bf4..8683331a243c0524776f8cf32d830202c6801cb7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.9.8-1) UNRELEASED; urgency=low
+dcpomatic (2.9.9-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -446,8 +446,9 @@ dcpomatic (2.9.8-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Fri, 29 Jul 2016 12:30:42 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Thu, 04 Aug 2016 23:41:20 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/wscript b/wscript
index 5e40320d1db82e9180c82f29b8f67bcf7517f590..0de69684b12d87dd516f8f31e40ef8898ef569b3 100644 (file)
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.9.8devel'
+VERSION = '2.9.9devel'
 
 def options(opt):
     opt.load('compiler_cxx')