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

diff --git a/ChangeLog b/ChangeLog
index 07fa91a391ff512c0a47aff3af58b4610fa6b8a3..a541614ef71d983e49781e8eb460bc80930fad7f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-12-14  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.10.4 released.
+
 2016-12-14  Carl Hetherington  <cth@carlh.net>
 
        * Updated zh_CN translation from 刘汉源.

diff --git a/debian/changelog b/debian/changelog
index 7ce273731cb9a30e12a47aead9950d0d05243d20..e0a653c95516bd594499bca3755b94d111803974 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.10.3-1) UNRELEASED; urgency=low
+dcpomatic (2.10.4-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -482,8 +482,9 @@ dcpomatic (2.10.3-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sun, 11 Dec 2016 18:28:09 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Wed, 14 Dec 2016 16:53:20 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/wscript b/wscript
index 767897218de126fa1475aea42d6b9d922696fa3f..be2409c4ead9a6ce1b4d78545c1a559e7ec4d29f 100644 (file)
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.10.3devel'
+VERSION = '2.10.4devel'
 
 def options(opt):
     opt.load('compiler_cxx')