Fix merge.

diff --cc ChangeLog
index ac0cbdf4b62348c051645a08f9c42721fdea238e,fb19b944148c6f51185f09c2499804ea145e31b7..c0b3d05834c4e6f815742c2630ca74eba5a89461
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,13 +1,18 @@@
 +2015-06-25  c.hetherington  <cth@carlh.net>
 +
 +      * 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.

diff --cc src/wx/subtitle_panel.cc
Simple merge