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

diff --git a/ChangeLog b/ChangeLog
index a887a90c6f93807fb9a2c01ef19f2dd4970a2769..5d90b75abc6546808e69adff1d2c0b99a1687f74 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-10  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.4.7 released.
+
 2015-10-10  Carl Hetherington  <cth@carlh.net>
 
        * Updated nl_NL translation from

diff --git a/debian/changelog b/debian/changelog
index 99471090a2ed009770280c952978591a1e596d5c..e195b31fab4c0c62732aa15dab29e28f15296893 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.4.6-1) UNRELEASED; urgency=low
+dcpomatic (2.4.7-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -328,8 +328,9 @@ dcpomatic (2.4.6-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Fri, 09 Oct 2015 17:18:35 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Sat, 10 Oct 2015 14:26:16 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/wscript b/wscript
index 867b0385ecd12160c5545b461065ca5d25467b9a..98c31d08e8592240b7b6e743c3b6a1ecef78860d 100644 (file)
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.4.6devel'
+VERSION = '2.4.7devel'
 
 def options(opt):
     opt.load('compiler_cxx')