Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 8e5c6a8a3..ce5f2c705 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-02-20  Carl Hetherington  <cth@carlh.net>
 
+	* Version 1.64.15 released.
+
+2014-02-20  Carl Hetherington  <cth@carlh.net>
+
 	* Basic support for 7.1 / HI/VI audio tracks.
 
 2014-02-19  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index e32d67e6a..79b1f98c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.64.14-1) UNRELEASED; urgency=low
+dcpomatic (1.64.15-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -95,8 +95,9 @@ dcpomatic (1.64.14-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Tue, 18 Feb 2014 23:03:21 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Thu, 20 Feb 2014 10:10:09 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index cfc6ada21..64616eb73 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.64.14devel'
+VERSION = '1.64.15devel'
 
 def options(opt):
     opt.load('compiler_cxx')