summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-10-10 12:46:29 +0100
committerCarl Hetherington <cth@carlh.net>2013-10-10 12:46:29 +0100
commitd85e27722bd3ca0e1e9e21645d817f0707d7888a (patch)
tree41c09e313f20e8ea168673cc192e206b9214a7c3
parentb1b405d74957a049074416343992f31229407c90 (diff)
parent20561fe7b1f1c59434ea669b7fc690878767c031 (diff)
Merge changelog.
-rw-r--r--ChangeLog6
-rw-r--r--debian/changelog5
-rw-r--r--wscript2
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index eaaefd1ed..2599b9b97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
* Various improvements to dcpomatic_kdm.
+2013-10-10 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.11 released.
+
+2013-10-10 Carl Hetherington <cth@carlh.net>
+
* libdcp fix to incorrect signature digests.
2013-10-09 Carl Hetherington <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 19200f983..d6a3e52be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.10-1) UNRELEASED; urgency=low
+dcpomatic (1.11-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -14,8 +14,9 @@ dcpomatic (1.10-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Wed, 09 Oct 2013 16:39:22 +0100
+ -- Carl Hetherington <carl@d1stkfactory> Thu, 10 Oct 2013 10:48:32 +0100
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index b03080cbd..c590c5ef4 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dcpomatic'
-VERSION = '1.11pre'
+VERSION = '1.12pre'
def options(opt):
opt.load('compiler_cxx')