summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-03-31 15:24:52 +0100
committerCarl Hetherington <cth@carlh.net>2014-03-31 15:24:52 +0100
commitd344423f8a0e9765684f5e25a6ce4966a3da31d0 (patch)
tree221a4cc12f8b6bab4b4562ab827ee112dc01a313
parent6bc5caa116382d3540678dbc1ea97cb23dd4e5ef (diff)
parent03d55c449d5b16f551cd073bafe2fd296f909c20 (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 c2ad803b1..c8a9ddf8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-03-30 Carl Hetherington <cth@carlh.net>
+ * Version 1.66.9 released.
+
+2014-03-30 Carl Hetherington <cth@carlh.net>
+
* Version 1.66.8 released.
* nl_NL translation from Theo Kooijmans.
diff --git a/debian/changelog b/debian/changelog
index c4a291b54..4891fc0a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.66.8-1) UNRELEASED; urgency=low
+dcpomatic (1.66.9-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -112,8 +112,9 @@ dcpomatic (1.66.8-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Sun, 30 Mar 2014 20:08:52 +0100
+ -- Carl Hetherington <carl@d1stkfactory> Sun, 30 Mar 2014 22:00:50 +0100
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index 82cf7f568..fe834f343 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dcpomatic'
-VERSION = '1.66.8devel'
+VERSION = '1.66.9devel'
def options(opt):
opt.load('compiler_cxx')