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

diff --git a/ChangeLog b/ChangeLog
index 96f2101d03ac412dff9c1495c6c99613fc3517b9..ae6f0f1e0bf411063b0b01a5f89e462e304bcbc0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+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.

diff --git a/debian/changelog b/debian/changelog
index 8e9cb6cdb4cb2034777fa9e25dd6b8b8a86cac56..b225db7d84ccf3be5d1ac0f9874dbc51c362e455 100644 (file)
--- 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 48c729a09a13377ee0b55a8f0788fd59310513e3..3b368791bfdf9486fb95db210ef738c328e5b169 100644 (file)
--- 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')