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

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 729ce5676..87e3a6555 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-12  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.20 released.
+
 2014-11-10  Carl Hetherington  <cth@carlh.net>
 
 	* Guess initial scale from the size of video
diff --git a/debian/changelog b/debian/changelog
index 4f7006794..9913d2e30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.0.19-1) UNRELEASED; urgency=low
+dcpomatic (2.0.20-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -198,8 +198,9 @@ dcpomatic (2.0.19-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Thu, 30 Oct 2014 19:43:52 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Wed, 12 Nov 2014 18:01:27 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 4b1f78e4b..8ff254877 100644
--- a/wscript
+++ b/wscript
@@ -5,7 +5,7 @@ import distutils
 import distutils.spawn
 
 APPNAME = 'dcpomatic'
-VERSION = '2.0.19devel'
+VERSION = '2.0.20devel'
 
 def options(opt):
     opt.load('compiler_cxx')