summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-02-11 09:51:42 +0000
committerCarl Hetherington <cth@carlh.net>2014-02-11 09:51:42 +0000
commit22f2cd94132f93a159c2ce9fe263771cb5a5dbdf (patch)
treeff2dda179649127d7bb3bfb08501d1ec3912ffaa
parentb731111427d94da2e3e231892c6e6edf3dd3f40f (diff)
parentf80e6907d8e48e284398b9a146041b43da96713a (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 38d9b667e..e51740c33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
2014-02-10 Carl Hetherington <cth@carlh.net>
+ * Version 1.64.11 released.
+
+2014-02-10 Carl Hetherington <cth@carlh.net>
+
* Version 1.64.10 released.
2014-02-10 Carl Hetherington <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 8e86fee2c..0b4453a31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.64.10-1) UNRELEASED; urgency=low
+dcpomatic (1.64.11-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -91,8 +91,9 @@ dcpomatic (1.64.10-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Mon, 10 Feb 2014 16:41:52 +0000
+ -- Carl Hetherington <carl@d1stkfactory> Mon, 10 Feb 2014 20:09:25 +0000
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index 885645e48..50d89f434 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dcpomatic'
-VERSION = '1.64.10devel'
+VERSION = '1.64.11devel'
def options(opt):
opt.load('compiler_cxx')