summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-07-10 15:58:21 +0100
committerCarl Hetherington <cth@carlh.net>2014-07-10 15:58:21 +0100
commit46f9949259a5402267d1f2809101b4f8c371dc70 (patch)
tree4057e15b8306af21a193df21fe364d24ef8008e5
parent3408efe149c709213d67e6a8583507d9e3b0d6ee (diff)
parent768c3c7de082fb2449e57a8fd5c05fc32dad665d (diff)
Merge.
-rw-r--r--ChangeLog2
-rw-r--r--debian/changelog5
-rw-r--r--wscript2
3 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e72598bbe..fee8a50f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
* Try to fix corruption of KDM email setting in
some cases.
+ * Version 1.72.1 released.
+
2014-07-08 Carl Hetherington <cth@carlh.net>
* Fix various problems with seek and content
diff --git a/debian/changelog b/debian/changelog
index 69508cb10..09662e58b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.72.0-1) UNRELEASED; urgency=low
+dcpomatic (1.72.1-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -165,8 +165,9 @@ dcpomatic (1.72.0-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Mon, 30 Jun 2014 10:43:16 +0100
+ -- Carl Hetherington <carl@d1stkfactory> Thu, 10 Jul 2014 15:37:26 +0100
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index 404782b3c..44340bc46 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dcpomatic'
-VERSION = '1.72.0devel'
+VERSION = '1.72.1devel'
def options(opt):
opt.load('compiler_cxx')