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 b39c72116..74b2cb0a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-01  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.13 released.
+
 2014-09-30  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.0.12 released.
diff --git a/debian/changelog b/debian/changelog
index 358bd5f97..17cbec9fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-dcpomatic (2.0.12-1) UNRELEASED; urgency=low
+dcpomatic (2.0.13-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Tue, 30 Sep 2014 20:45:49 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Wed, 01 Oct 2014 09:54:33 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 7924decea..1fbdf0c32 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '2.0.12devel'
+VERSION = '2.0.13devel'
 
 def options(opt):
     opt.load('compiler_cxx')