Merge master.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 04778b35f72b1a98fb7118b4c5538be69e591920..23ccae1902d6f8189f305fa33f221f08f27353ae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2014-08-06  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.0.1 released.
+
+2014-07-15  Carl Hetherington  <cth@carlh.net>
+
+       * A variety of changes were made on the 2.0 branch
+       but not documented in the ChangeLog.  Most sigificantly:
+
+       - DCP import
+       - Creation of DCPs with proper XML subtitles
+       - Import of .srt and .xml subtitles
+       - Audio processing framework (with some basic processors).
+
+2014-03-07  Carl Hetherington  <cth@carlh.net>
+
+       * Add subtitle view.
+
 2014-08-09  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.72.10 released.
@@ -61,6 +79,7 @@
 2014-07-10  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.72.2 released.
+>>>>>>> origin/master
 
 2014-07-10  Carl Hetherington  <cth@carlh.net>