summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-09-16 21:16:33 +0100
committerCarl Hetherington <cth@carlh.net>2014-09-16 21:16:33 +0100
commit99178eea5f3d326ece871ec82da1d7ca9e2dbcaf (patch)
treefb061859d069605944bc62c5b27543265d4e60ab
parent138dbf31b4f4d711113f91d597c4f312b756d59b (diff)
parentc177bbcd0f77aab611064fd8bd706b0df337d881 (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 9d42431b8..6f5bbb0ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
2014-09-14 Carl Hetherington <cth@carlh.net>
+ * Version 1.73.6 released.
+
+2014-09-14 Carl Hetherington <cth@carlh.net>
+
* Version 1.73.5 released.
2014-09-14 Carl Hetherington <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 0584ec5c2..07f0510ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.73.5-1) UNRELEASED; urgency=low
+dcpomatic (1.73.6-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -181,8 +181,9 @@ dcpomatic (1.73.5-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Sun, 14 Sep 2014 10:56:13 +0100
+ -- Carl Hetherington <carl@d1stkfactory> Sun, 14 Sep 2014 21:50:07 +0100
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index d1ce36e3c..801fe0547 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dcpomatic'
-VERSION = '1.73.5devel'
+VERSION = '1.73.6devel'
def options(opt):
opt.load('compiler_cxx')