summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-03-09 22:03:49 +0000
committerCarl Hetherington <cth@carlh.net>2014-03-09 22:03:49 +0000
commitb5d2f083b2f8b260ac238bd06092773770605850 (patch)
tree18b39da5ac14019a0a16378ced802385bbceb754
parent3a9bea8c3727af6ebbce860b8223371cd7f87b3f (diff)
parenta93ef3b958766d0346f9c44479f3e058dfdd0147 (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 be3b611e6..4bb6b732b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
2014-03-08 Carl Hetherington <cth@carlh.net>
+ * Version 1.65.1 released.
+
+2014-03-08 Carl Hetherington <cth@carlh.net>
+
* Fix incorrect audio analyses on multiple-stream content.
* Support for unsigned 8-bit audio (hmm!).
diff --git a/debian/changelog b/debian/changelog
index 5ce77d8af..2290bd776 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.65.0-1) UNRELEASED; urgency=low
+dcpomatic (1.65.1-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -101,8 +101,9 @@ dcpomatic (1.65.0-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Thu, 06 Mar 2014 18:28:57 +0000
+ -- Carl Hetherington <carl@d1stkfactory> Sat, 08 Mar 2014 19:10:49 +0000
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index 52191f4b0..18a24ee54 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dcpomatic'
-VERSION = '1.65.0devel'
+VERSION = '1.65.1devel'
def options(opt):
opt.load('compiler_cxx')