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 6c132817e..cb79e5773 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2016-12-21  Carl Hetherington  <cth@carlh.net>
 
+	* Version 2.10.5 released.
+
+2016-12-21  Carl Hetherington  <cth@carlh.net>
+
 	* Make "Add folder..." to accept a directory of WAV files (#942).
 
 2016-12-19  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index e0a653c95..b3599ed19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.10.4-1) UNRELEASED; urgency=low
+dcpomatic (2.10.5-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -483,8 +483,9 @@ dcpomatic (2.10.4-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Wed, 14 Dec 2016 16:53:20 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Wed, 21 Dec 2016 13:54:08 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index be2409c4e..cbb80bb2e 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.10.4devel'
+VERSION = '2.10.5devel'
 
 def options(opt):
     opt.load('compiler_cxx')