Merge.

diff --git a/ChangeLog b/ChangeLog
index 34db26bcb4b73c325d9fd944c1183a2acf9ccc55..fd8dcded77ed19e41e682074f9cbd6b2640dba7b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
 
        * Add TLS/SSL support to KDM email sending.
 
+2013-12-23  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.47 released.
+
+2013-12-23  Carl Hetherington  <cth@carlh.net>
+
        * Add $START_TIME and $END_TIME as variables for the KDM email.
 
        * Add top/bottom option for 3D frames.

diff --git a/debian/changelog b/debian/changelog
index df60e23f5d261dad03a63156c24590c179a61b1e..2202290146eda0ceba3afbd9e4df32284447e541 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.46-1) UNRELEASED; urgency=low
+dcpomatic (1.47-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -50,8 +50,9 @@ dcpomatic (1.46-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Fri, 20 Dec 2013 20:53:40 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Mon, 23 Dec 2013 01:59:16 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/wscript b/wscript
index 212f1d5c6929d88d0503329a474cf1555e142d68..4a260b5880ee42a4375e3239a63df9f89a04bcba 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.47pre'
+VERSION = '1.48pre'
 
 def options(opt):
     opt.load('compiler_cxx')