Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Thu, 14 Jan 2016 10:21:13 +0000 (10:21 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 14 Jan 2016 10:21:13 +0000 (10:21 +0000)
1  2 
ChangeLog

diff --cc ChangeLog
index 1f5889a30d89357e8f3fa497d3bba279ada27597,b9a83aedd1165652e1ce14df4c14fac4577d88b9..9e4f58db8a8400acc8270950073d979ef6849734
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
 +2016-01-14  Carl Hetherington  <cth@carlh.net>
 +
 +      * Allow multiple CC addresses for KDM emails (#785).
 +
+ 2016-01-13  Carl Hetherington  <cth@carlh.net>
+       * Version 2.6.16 released.
  2016-01-13  Carl Hetherington  <cth@carlh.net>
  
        * Fix incorrect fades when trim is being used.