Merge.

diff --git a/ChangeLog b/ChangeLog
index 16eabd8d4a7da72471cde41fb2af72262c26427d..5686be088af8de24eb990c947d57581c4078bf42 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
        * Add option to log SMTP session transcripts
        for debugging failures to send email.
 
+       * Version 2.4.9 released.
+
+2015-10-11  Carl Hetherington  <cth@carlh.net>
+
        * Provide progress indication when finding
        subtitles (#711).
 

diff --git a/debian/changelog b/debian/changelog
index 62ee8ef5966ea02b28d524faebfa66b3aa4fe78c..07903454583c3b9269844dbfef919da7ac281608 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.4.8-1) UNRELEASED; urgency=low
+dcpomatic (2.4.9-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -330,8 +330,9 @@ dcpomatic (2.4.8-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sat, 10 Oct 2015 18:59:39 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Sun, 11 Oct 2015 18:37:55 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/wscript b/wscript
index 8ee38ea4eb0d1dc5b55660963b5035d7943ee9c4..7da4707400798043d7068fe3c5b4d332c00228ab 100644 (file)
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.4.8devel'
+VERSION = '2.4.9devel'
 
 def options(opt):
     opt.load('compiler_cxx')