summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-02-08 16:37:36 +0000
committerCarl Hetherington <cth@carlh.net>2014-02-08 16:37:36 +0000
commita81037803e637a8b592635b8b973aecdb67ca0ce (patch)
tree5149c532b03e2a54ca7453afa166b131a7b9ec67
parentdf45c5e6d63ad0927844839056735ce5a8db3c92 (diff)
parent248382f6e1569a9d10d82764967af720d9bbf883 (diff)
Merge branch 'master' of ssh://carlh.dyndns.org/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 5a842a4f3..7f4045c4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-02-08 Carl Hetherington <cth@carlh.net>
+ * Version 1.64.3 released.
+
+2014-02-08 Carl Hetherington <cth@carlh.net>
+
* Bump libdcp version to get some fixes for Interop XML.
2014-02-07 Carl Hetherington <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index e0e6152be..a9bf676ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.64.2-1) UNRELEASED; urgency=low
+dcpomatic (1.64.3-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -83,8 +83,9 @@ dcpomatic (1.64.2-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Wed, 05 Feb 2014 23:27:37 +0000
+ -- Carl Hetherington <carl@d1stkfactory> Sat, 08 Feb 2014 13:33:08 +0000
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index 95fb7f92c..425bfee20 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dcpomatic'
-VERSION = '1.64.2devel'
+VERSION = '1.64.3devel'
def options(opt):
opt.load('compiler_cxx')