summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-02-25 17:35:08 +0000
committerCarl Hetherington <cth@carlh.net>2014-02-25 17:35:08 +0000
commit075ee0f7766c9c5bdd0ed3957d1cbac91ae11d53 (patch)
treef45ebb8f4ff01759cde7e05ed8016810ff16e7b8
parent11b9b68bcd1712f950927382d5bd4d240123d289 (diff)
parent0e67b303c1cf9279ab43e0059a4e8525573f06df (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 ba4cf9377..e9607abbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-02-23 Carl Hetherington <cth@carlh.net>
+ * Version 1.64.16 released.
+
+2014-02-23 Carl Hetherington <cth@carlh.net>
+
* Bump ffmpeg library to git head to fix problems with
misrecognised frame rates in some MOV files.
diff --git a/debian/changelog b/debian/changelog
index 79b1f98c3..15517b1a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.64.15-1) UNRELEASED; urgency=low
+dcpomatic (1.64.16-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
@@ -96,8 +96,9 @@ dcpomatic (1.64.15-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Thu, 20 Feb 2014 10:10:09 +0000
+ -- Carl Hetherington <carl@d1stkfactory> Sun, 23 Feb 2014 22:38:19 +0000
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/wscript b/wscript
index 64616eb73..e58f0a977 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dcpomatic'
-VERSION = '1.64.15devel'
+VERSION = '1.64.16devel'
def options(opt):
opt.load('compiler_cxx')