summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-06-19 21:10:06 +0100
committerCarl Hetherington <cth@carlh.net>2016-06-19 21:10:06 +0100
commit9ed30857c1c7795b6964b16c4c0b992a9c306791 (patch)
treeb2223f5b0bd0a7a924bae093656051f3559bb93b
parentacf8657598267791f273c1424d34e1fc9bc547c0 (diff)
parent796e6a7dc6f4ff24956ed5c4b9fae78ac7253a7f (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 784a68674..c149a339f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-06-19 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.8.10 released.
+
2016-06-17 Carl Hetherington <cth@carlh.net>
* Add configurable default for the number of DCP
diff --git a/debian/changelog b/debian/changelog
index 2c1b3fa93..d6799446a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.8.9-1) UNRELEASED; urgency=low
+dcpomatic (2.8.10-1) UNRELEASED; urgency=low
[ Carl Hetherington ]
* New upstream release.
@@ -426,8 +426,9 @@ dcpomatic (2.8.9-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Wed, 08 Jun 2016 23:23:14 +0100
+ -- Carl Hetherington <carl@d1stkfactory> Sun, 19 Jun 2016 00:43:51 +0100
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index 39861cf8e..e1dc197a4 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
from waflib import Logs, Context
APPNAME = 'dcpomatic'
-VERSION = '2.8.9devel'
+VERSION = '2.8.10devel'
def options(opt):
opt.load('compiler_cxx')