Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 79453fc4c..60f49027b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
 
 2015-07-21  Carl Hetherington  <cth@carlh.net>
 
+	* Version 2.1.27 released.
+
+2015-07-21  Carl Hetherington  <cth@carlh.net>
+
 	* Fix incorrect conversion of audio from DCP sources (#642).
 
 2015-07-20  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index ed5aa2bd5..092731ba5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.1.26-1) UNRELEASED; urgency=low
+dcpomatic (2.1.27-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -257,8 +257,9 @@ dcpomatic (2.1.26-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Mon, 20 Jul 2015 21:54:28 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Tue, 21 Jul 2015 23:43:08 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 40a0d3936..0c62f3a5e 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs
 
 APPNAME = 'dcpomatic'
-VERSION = '2.1.26devel'
+VERSION = '2.1.27devel'
 
 def options(opt):
     opt.load('compiler_cxx')