Merge master.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 29576e47827ea259b9c6c2a2e783766b0f3af8a5..126730e27f8e232e481b470e7fda00549606f49e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2014-03-07  Carl Hetherington  <cth@carlh.net>
+
+       * Add subtitle view.
+
+2014-06-12  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.69.26 released.
+
+2014-06-12  Carl Hetherington  <cth@carlh.net>
+
+       * Fix bug where DCP-o-matic does not recreate video after
+       subtitles are turned on or off.
+
+2014-06-10  Carl Hetherington  <cth@carlh.net>
+
+       * Support ISDCF naming convention version 9 (#257).
+
+       * Rename DCI to ISDCF when talking about the digital cinema
+       naming convention (#362).
+
+       * Fix crash when opening the timeline with no content (#369).
+
 2014-06-09  Carl Hetherington  <cth@carlh.net>
 
        * Fix server/client with non-RGB24 sources.