summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-02-08 16:59:43 +0000
committerCarl Hetherington <cth@carlh.net>2014-02-08 16:59:43 +0000
commit01fe9daeeda28b7303b04d49850b58eb2de05ec1 (patch)
tree26c7cfbcd4576525d153b4eecf97d926d6275604
parent3a39682d6a894c83a3646be7d104f77c71f64400 (diff)
parent151894c625e87ab637ec1437e512b0293a887707 (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 7f4045c4f..d35f00543 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-02-08 Carl Hetherington <cth@carlh.net>
+ * Version 1.64.4 released.
+
+2014-02-08 Carl Hetherington <cth@carlh.net>
+
* Version 1.64.3 released.
2014-02-08 Carl Hetherington <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index a9bf676ad..aa29a25db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.64.3-1) UNRELEASED; urgency=low
+dcpomatic (1.64.4-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -84,8 +84,9 @@ dcpomatic (1.64.3-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Sat, 08 Feb 2014 13:33:08 +0000
+ -- Carl Hetherington <carl@d1stkfactory> Sat, 08 Feb 2014 16:38:06 +0000
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index 8663f2caa..0f94b58d8 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dcpomatic'
-VERSION = '1.64.3devel'
+VERSION = '1.64.4devel'
def options(opt):
opt.load('compiler_cxx')