Merge master.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index d9295894a5c01415cba2a23f4553a318eba62582..d25196832ee9985848b7f841895e5398dfd4f16d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,50 @@
+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-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.
+
+       * Make KDM email subject configurable.
+
+       * Updates to de_DE from Carsten Kurz.
+
        * Limit allowed KDM types based on Interop/SMPTE setting
        of DCP (#385).
 
@@ -13,6 +58,7 @@
 2014-07-10  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.72.2 released.
+>>>>>>> origin/master
 
 2014-07-10  Carl Hetherington  <cth@carlh.net>