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 65b443e4c..bea02a8b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2015-12-03  Carl Hetherington  <cth@carlh.net>
 
+	* Version 2.6.2 released.
+
+2015-12-03  Carl Hetherington  <cth@carlh.net>
+
 	* Version 2.6.1 released.
 
 2015-12-03  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index 452b245eb..d8d95534b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.6.1-1) UNRELEASED; urgency=low
+dcpomatic (2.6.2-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -358,8 +358,9 @@ dcpomatic (2.6.1-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Thu, 03 Dec 2015 10:09:16 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Thu, 03 Dec 2015 20:31:52 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index cbf10781e..4f4ad5e9b 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.6.1devel'
+VERSION = '2.6.2devel'
 
 def options(opt):
     opt.load('compiler_cxx')