summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-03-17 10:35:53 +0000
committerCarl Hetherington <cth@carlh.net>2014-03-17 10:35:53 +0000
commite47256cdeceb58f60fecc78d272f5971aa2e55ae (patch)
treea6d13c3bb6875113460e64c0fae839d7d5e84796
parenta7500ae8265ce7511409c6652963c8520940360b (diff)
parent903e3b22b449280bddeb70f8f2ed15e9fb8cde9d (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 c4c2c9c63..15aa8a87b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-03-17 Carl Hetherington <cth@carlh.net>
+ * Version 1.66.2 released.
+
+2014-03-17 Carl Hetherington <cth@carlh.net>
+
* Improve appearance of config dialog on OS X.
2014-03-15 Carl Hetherington <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 2a1593a5b..c7b6fbebc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.66.1-1) UNRELEASED; urgency=low
+dcpomatic (1.66.2-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -105,8 +105,9 @@ dcpomatic (1.66.1-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Wed, 12 Mar 2014 00:12:04 +0000
+ -- Carl Hetherington <carl@d1stkfactory> Mon, 17 Mar 2014 09:20:12 +0000
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index aa20e9946..682ceb9cd 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dcpomatic'
-VERSION = '1.66.1devel'
+VERSION = '1.66.2devel'
def options(opt):
opt.load('compiler_cxx')