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

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 0ca747ea15bf21dccefd87ef2da522cbfa8eb845..687e30757454ce37c1e8e03a71157ee2e1847eee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+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>
+
+       * Version 2.11.14 released.
+
 2017-07-18  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.11.13 released.