Merge master.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 62777b4d2c9651edaeb8567c1c5a833896e3840a..23ccae1902d6f8189f305fa33f221f08f27353ae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,63 @@
+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.
+
+2014-08-09  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.72.8 released.
+
+2014-08-08  Carl Hetherington  <cth@carlh.net>
+
+       * Approximate support for changing timing details of multiple
+       bits of content at the same time.
+
+       * Allow removal of multiple bits of content at the same time.
+
+       * Version 1.72.7 released.
+
+2014-08-04  Carl Hetherington  <cth@carlh.net>
+
+       * Add BCC option for KDM emails.
+
+2014-07-29  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.72.5 released.
+
+2014-07-17  Carl Hetherington  <cth@carlh.net>
+
+       * Fix corrupted text in job descriptions in some cases.
+
+       * Speculative fix for failure to keep Windows
+       machines awake during encodes.
+
+2014-07-16  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.72.4 released.
+
+2014-07-16  Carl Hetherington  <cth@carlh.net>
+
+       * Add default scaling setting to preferences (#384).
+
+       * Version 1.72.3 released.
+
 2014-07-16  Carl Hetherington  <cth@carlh.net>
 
        * Improve approximate time reports a bit.
@@ -19,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>