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

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index b8e85cc87a5636114bee6af065f21f5efbbe2178..60b6254420a9f2664a644db49e35c7c698c6ec29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
+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).
+
+       * Fix incorrect hint about 3D content in a 2D DCP.
+
        * Detect and convert from non-UTF-8
        subtitle encodings.