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

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 5eca8328e230b6f4fb86dbd16dc93d0f13304091..687e30757454ce37c1e8e03a71157ee2e1847eee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
+2017-07-25  Carl Hetherington  <cth@carlh.net>
+
+       * Configurable config.xml location (#780, #1100).
+
 2017-07-24  Carl Hetherington  <cth@carlh.net>
 
+       * Update ISDCF name when DCP frame rate changes (#1102).
+
        * Updated zh_CN translation from 刘汉源.
 
 2017-07-18  Carl Hetherington  <cth@carlh.net>