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

3 files changed, 10 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 96f2101d0..ae6f0f1e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2015-09-09  Carl Hetherington  <cth@carlh.net>
 
+	* Version 2.1.60 released.
+
+2015-09-09  Carl Hetherington  <cth@carlh.net>
+
 	* Updated fr_FR translation from Thierry Journet.
 
 	* Version 2.1.59 released.
diff --git a/debian/changelog b/debian/changelog
index 8e9cb6cdb..b225db7d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.1.59-1) UNRELEASED; urgency=low
+dcpomatic (2.1.60-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -294,7 +294,10 @@ dcpomatic (2.1.59-1) UNRELEASED; urgency=low
   [ c.hetherington ]
   * New upstream release.
 
- -- c.hetherington <c.hetherington@cs2-24.cs>  Wed, 09 Sep 2015 09:55:43 +0100
+  [ Carl Hetherington ]
+  * New upstream release.
+
+ -- Carl Hetherington <cth@carlh.net>  Wed, 09 Sep 2015 22:54:00 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 48c729a09..3b368791b 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs
 
 APPNAME = 'dcpomatic'
-VERSION = '2.1.59devel'
+VERSION = '2.1.60devel'
 
 def options(opt):
     opt.load('compiler_cxx')