summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-08-05 09:35:09 +0100
committerCarl Hetherington <cth@carlh.net>2016-08-05 09:35:09 +0100
commit8a56d70d2506feda37e3e88c4f37dc072fe75338 (patch)
tree77b7a97bbb07f5548799f6db9bda3218f005c6f6
parentd3c9dca9e6c477947b111f34b617b76e07a0116b (diff)
parentf2f5710a463b5f1629fb789578bc21d673155ff8 (diff)
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
-rw-r--r--ChangeLog4
-rw-r--r--debian/changelog5
-rw-r--r--wscript2
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 73d8242ee..4795375d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
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.
2016-07-31 Carl Hetherington <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 37d135f23..8683331a2 100644
--- 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 5e40320d1..0de69684b 100644
--- 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')