summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-06-30 14:17:08 +0100
committerCarl Hetherington <cth@carlh.net>2014-06-30 14:17:08 +0100
commita6b3b4539ae17ce59f975a4be49278f4ccc736fd (patch)
tree70b53bd46307ec2aa4c088abfbc412f128580bcc
parent9f8244c8b84c0dd5ff06c249c761105e14781176 (diff)
parent7d93aa13507094e87bc9086986b36edd96a613b0 (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 46b8be088..67a818f3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-30 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.72.0 released.
+
2014-06-28 Carl Hetherington <cth@carlh.net>
* Version 1.71.2 released.
diff --git a/debian/changelog b/debian/changelog
index 224e44da3..69508cb10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.71.2-1) UNRELEASED; urgency=low
+dcpomatic (1.72.0-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -164,8 +164,9 @@ dcpomatic (1.71.2-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Sat, 28 Jun 2014 00:54:23 +0100
+ -- Carl Hetherington <carl@d1stkfactory> Mon, 30 Jun 2014 10:43:16 +0100
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index cbd2e4640..404782b3c 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dcpomatic'
-VERSION = '1.71.2devel'
+VERSION = '1.72.0devel'
def options(opt):
opt.load('compiler_cxx')