summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-02-18 20:50:11 +0000
committerCarl Hetherington <cth@carlh.net>2014-02-18 20:50:11 +0000
commitc116d1ba8656a157f6d81a3d10cd0ac86968554f (patch)
treeb2ff709c4bee5548c5028854615030f34830bb09
parent7908592de8bda34f18bd9527975f05c795d93a28 (diff)
parent260ccea9bb42513acfbf873f960569a3a6522236 (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 a66eb71d7..e51469ccc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-18 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.64.13 released.
+
2014-02-12 Carl Hetherington <cth@carlh.net>
* Make the batch converter remember its last directory
diff --git a/debian/changelog b/debian/changelog
index ec21747ee..789edfd3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.64.12-1) UNRELEASED; urgency=low
+dcpomatic (1.64.13-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -93,8 +93,9 @@ dcpomatic (1.64.12-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Tue, 11 Feb 2014 15:52:44 +0000
+ -- Carl Hetherington <carl@d1stkfactory> Tue, 18 Feb 2014 20:48:59 +0000
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index 05a39a738..131ca8830 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dcpomatic'
-VERSION = '1.64.12devel'
+VERSION = '1.64.13devel'
def options(opt):
opt.load('compiler_cxx')