X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ChangeLog;h=60b6254420a9f2664a644db49e35c7c698c6ec29;hb=9d4678143d1fa992059c90a2b0997fa5cae81e93;hp=eeb57f1fed665e14ae8cb0829de9fdbb2cfb5303;hpb=225e256d753b9a42961038c52f425725888b8f62;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index eeb57f1fe..60b625442 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+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.
+
+2015-09-21  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.3.5 released.
+
+2015-09-20  Carl Hetherington  <cth@carlh.net>
+
+	* Fix setting of frame rate when loading
+	image folders.
+
+2015-09-18  Carl Hetherington  <cth@carlh.net>
+
+	* Add another upmixer which is a simpler
+	matrix-type thing with no filtering
+	(apart from Lfe).
+
+2015-09-17  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.3.4 released.
+
 2015-09-17  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.3.3 released.