Fix merge.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index ac0cbdf4b62348c051645a08f9c42721fdea238e..c0b3d05834c4e6f815742c2630ca74eba5a89461 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,16 @@
        * Disallow impossible burn settings by manipulating
        the controls in the subtitle panel (#625).
 
+2015-06-26  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.1.11 released.
+
+2015-06-26  Carl Hetherington  <cth@carlh.net>
+
+       * Fix missing subtitles in some cases.
+
+       * Fix no-rebuild of DCP after subtitle burn is turned off/on.
+
 2015-06-25  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.1.10 released.