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

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index b81fc19a58a2e61cec01600ec58e07e00e5039e9..60b6254420a9f2664a644db49e35c7c698c6ec29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-09-26  Carl Hetherington  <cth@carlh.net>
+
+       * Fix crash with embedded subtitles with some
+       video files.
+
+       * Version 2.3.6 released.
+
 2015-09-25  Carl Hetherington  <cth@carlh.net>
 
        * Fix assertion failure when loading .MTS files (#702).