summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-08-21 00:24:42 +0100
committerCarl Hetherington <cth@carlh.net>2017-08-21 00:24:42 +0100
commit2095bd0d3c84e59252b01424eb611eda76f276ca (patch)
treeac16adb20e4ad001d19d3e91bbb1668722a80088
parentbf5e1fe3137f05c46775c068915c5d7879a93603 (diff)
parent6635d4c9a1538228a0638861b37cf77c503acd92 (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 0f0b85f56..832303a05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-08-21 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.19 released.
+
2017-08-20 Carl Hetherington <cth@carlh.net>
* Add VF/OV and KDM support to player.
diff --git a/debian/changelog b/debian/changelog
index 1687df8e4..e790bfbcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.11.18-1) UNRELEASED; urgency=low
+dcpomatic (2.11.19-1) UNRELEASED; urgency=low
[ Carl Hetherington ]
* New upstream release.
@@ -510,8 +510,9 @@ dcpomatic (2.11.18-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@main.carlh.net> Fri, 18 Aug 2017 00:38:29 +0100
+ -- Carl Hetherington <carl@main.carlh.net> Mon, 21 Aug 2017 00:10:06 +0100
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index 56d048719..01538faa9 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
from waflib import Logs, Context
APPNAME = 'dcpomatic'
-VERSION = '2.11.18devel'
+VERSION = '2.11.19devel'
def options(opt):
opt.load('compiler_cxx')