From: Carl Hetherington <cth@carlh.net>
Date: Thu, 13 Nov 2014 11:08:21 +0000 (+0000)
Subject: Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
X-Git-Tag: v2.0.48~489
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=bf193143624df4cf3a49c99bda1955484051c722;hp=59a87a29043d29907c389b9fca7b5865bc0bdf84;p=dcpomatic.git

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

diff --git a/ChangeLog b/ChangeLog
index 87e3a6555..91bdfab79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-12  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.21 released.
+
 2014-11-12  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.0.20 released.
diff --git a/debian/changelog b/debian/changelog
index 9913d2e30..44747c47a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.0.20-1) UNRELEASED; urgency=low
+dcpomatic (2.0.21-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -199,8 +199,9 @@ dcpomatic (2.0.20-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Wed, 12 Nov 2014 18:01:27 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Wed, 12 Nov 2014 23:14:21 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 8ff254877..64249b6f0 100644
--- a/wscript
+++ b/wscript
@@ -5,7 +5,7 @@ import distutils
 import distutils.spawn
 
 APPNAME = 'dcpomatic'
-VERSION = '2.0.20devel'
+VERSION = '2.0.21devel'
 
 def options(opt):
     opt.load('compiler_cxx')