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

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 90b1760ed..e0ce41586 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-08  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.6.4 released.
+
 2015-11-30  Carl Hetherington  <cth@carlh.net>
 
 	* Port to OpenJPEG version 2.1.
diff --git a/debian/changelog b/debian/changelog
index 7bf245a29..5a859b232 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.6.3-1) UNRELEASED; urgency=low
+dcpomatic (2.6.4-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -360,8 +360,9 @@ dcpomatic (2.6.3-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Fri, 04 Dec 2015 09:16:23 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Tue, 08 Dec 2015 00:22:24 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 0e0baa9c7..84651c7dc 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.6.3devel'
+VERSION = '2.6.4devel'
 
 def options(opt):
     opt.load('compiler_cxx')