Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index f205716b2c559c4a5add59187b6917ea3fb52a29..717fcc5280634ba4821be62013de7ee444e22b68 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2015-01-21  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.0.36 released.
+
+2015-01-21  Carl Hetherington  <cth@carlh.net>
+
+       * Fix differentiation between MXF-wrapped subtitles
+       and video/audio content.
+
+2015-01-20  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.0.35 released.
+
+2015-01-20  c.hetherington  <cth@carlh.net>
+
+       * More informative error when failing to decode
+       JPEG2000 files.
+
 2015-01-15  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.0.34 released.