summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-09-14 13:22:30 +0100
committerCarl Hetherington <cth@carlh.net>2014-09-14 13:22:30 +0100
commit5dcb82b696d8abe7bfcd2c58cf22d6ead34ab95a (patch)
treee5e6d9e986f0be67cc489d55fda43ea11526d85b
parent9cb16d975e3369e4163b4e78eaa478b9ce5c57a6 (diff)
parented5fb94d493cc1db7fedbfd17128c5a0c9744f50 (diff)
Merge branch 'master' of ssh://main.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 6e5ee6d83..00b1c0089 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-09-14 Carl Hetherington <cth@carlh.net>
+ * Version 1.73.5 released.
+
+2014-09-14 Carl Hetherington <cth@carlh.net>
+
* Update to nl_NL translation from Cherif Ben Brahim.
2014-09-12 Carl Hetherington <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 5462ec7e4..0584ec5c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.73.4-1) UNRELEASED; urgency=low
+dcpomatic (1.73.5-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -180,8 +180,9 @@ dcpomatic (1.73.4-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Mon, 08 Sep 2014 23:03:01 +0100
+ -- Carl Hetherington <carl@d1stkfactory> Sun, 14 Sep 2014 10:56:13 +0100
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index 8db63f625..d1ce36e3c 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dcpomatic'
-VERSION = '1.73.4devel'
+VERSION = '1.73.5devel'
def options(opt):
opt.load('compiler_cxx')