summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-03-11 09:14:42 +0000
committerCarl Hetherington <cth@carlh.net>2014-03-11 09:14:42 +0000
commitb30ff27ec22ee16d4732fcaac924106e90ea1a87 (patch)
tree9d3353238696dac26bdcf1c0ff449dfe8427a4bc
parent759789f8bffe9889c1afd1433fcc6c92e38ed475 (diff)
parent2aa656cdac05f21d43eb236bf1f9c6ce806644dc (diff)
Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic
-rw-r--r--ChangeLog8
-rw-r--r--debian/changelog6
-rw-r--r--wscript2
3 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5ce1b0eb8..b6a18140d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-03-10 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.66.0 released.
+
+2014-03-09 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.65.2 released.
+
2014-03-09 Carl Hetherington <cth@carlh.net>
* Restore old behaviour of "no-stretch" mode with crop.
diff --git a/debian/changelog b/debian/changelog
index 2290bd776..066646601 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.65.1-1) UNRELEASED; urgency=low
+dcpomatic (1.66.0-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -102,8 +102,10 @@ dcpomatic (1.65.1-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Sat, 08 Mar 2014 19:10:49 +0000
+ -- Carl Hetherington <carl@d1stkfactory> Mon, 10 Mar 2014 15:49:01 +0000
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index 18a24ee54..e8ca949f9 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dcpomatic'
-VERSION = '1.65.1devel'
+VERSION = '1.66.0devel'
def options(opt):
opt.load('compiler_cxx')