From: Carl Hetherington <cth@carlh.net>
Date: Thu, 7 Jul 2016 15:06:10 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
X-Git-Tag: v2.9.0~2
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=fb607fb660317fcce15320c2ec7db78d85a43f41;hp=959aa1b6f71fef2e6a207c944e163042bf738697;p=dcpomatic.git

Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
---

diff --git a/ChangeLog b/ChangeLog
index 78f863e71..15f203775 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-07-07  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.8.20 released.
+
 2016-07-07  c.hetherington  <cth@carlh.net>
 
 	* Fix incorrect job running time reports (#912).
diff --git a/debian/changelog b/debian/changelog
index 9c2a0bae4..99674bec5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.8.19-1) UNRELEASED; urgency=low
+dcpomatic (2.8.20-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -436,8 +436,9 @@ dcpomatic (2.8.19-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Wed, 06 Jul 2016 19:56:40 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Thu, 07 Jul 2016 15:30:34 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index bb8a7a17b..a13b239f4 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.8.19devel'
+VERSION = '2.8.20devel'
 
 def options(opt):
     opt.load('compiler_cxx')