summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-07-18 16:07:16 +0100
committerCarl Hetherington <cth@carlh.net>2017-07-18 16:07:16 +0100
commit7686d48aab59eeca84b32c74606453628977d903 (patch)
tree8af7782804fe9fb25715e68024022245c7f320fc
parent2d57296a24c2eb4f6d99325add0e986de04f7e7d (diff)
parentcdffccfe09bb3ec603d7af79da50c1617260920a (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 1f74fba7f..0ca747ea1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-07-18 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.11.13 released.
+
2017-07-11 Carl Hetherington <cth@carlh.net>
* Version 2.11.12 released.
diff --git a/debian/changelog b/debian/changelog
index d5b4cb449..1e07cb128 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.11.12-1) UNRELEASED; urgency=low
+dcpomatic (2.11.13-1) UNRELEASED; urgency=low
[ Carl Hetherington ]
* New upstream release.
@@ -500,8 +500,9 @@ dcpomatic (2.11.12-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@main.carlh.net> Tue, 11 Jul 2017 14:31:15 +0100
+ -- Carl Hetherington <carl@main.carlh.net> Tue, 18 Jul 2017 13:48:31 +0100
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index 638b2c69f..6a1f44f75 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
from waflib import Logs, Context
APPNAME = 'dcpomatic'
-VERSION = '2.11.12devel'
+VERSION = '2.11.13devel'
def options(opt):
opt.load('compiler_cxx')