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 f0ba9f138..eaee084c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-09-09  Carl Hetherington  <cth@carlh.net>
 
+	* Version 2.0.7 released.
+
+2014-09-09  Carl Hetherington  <cth@carlh.net>
+
 	* Version 2.0.6 released.
 
 2014-09-09  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index aca6809c4..f8c7f3b40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.0.6-1) UNRELEASED; urgency=low
+dcpomatic (2.0.7-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -176,8 +176,9 @@ dcpomatic (2.0.6-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Tue, 09 Sep 2014 21:05:24 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Tue, 09 Sep 2014 22:46:29 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 6ce0615ee..d717c5ef0 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '2.0.6devel'
+VERSION = '2.0.7devel'
 
 def options(opt):
     opt.load('compiler_cxx')