Merge.

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 75b76db31..a528350be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 	* Put ISDCF name subtitle language in lower case if all subs are
 	burnt into the image.
 
+2015-12-09  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.6.5 released.
+
 2015-12-08  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.6.4 released.
diff --git a/debian/changelog b/debian/changelog
index 5a859b232..a54c4cf05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.6.4-1) UNRELEASED; urgency=low
+dcpomatic (2.6.5-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -361,8 +361,9 @@ dcpomatic (2.6.4-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Tue, 08 Dec 2015 00:22:24 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Wed, 09 Dec 2015 16:43:53 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 84651c7dc..725257b66 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.6.4devel'
+VERSION = '2.6.5devel'
 
 def options(opt):
     opt.load('compiler_cxx')