Merge master.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 1c8fc930be0ae00ed58216263da8e0c8ebac9d7f..de702dacf571603cbf6d457285a0748d3e9da725 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2014-06-21  Carl Hetherington  <cth@carlh.net>
 
+       * Move email config into the KDM email page.
+
        * Version 1.69.34 released.
 
 2014-06-21  Carl Hetherington  <cth@carlh.net>