Merge remote-tracking branch 'origin/master' into 1.0

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 3d95747dc7517e9dd3fed5bc9aef73561f6b6534..a15a44fe2b47595196af0f9a5b1db90a7bc7c49a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+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-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).
+
+       * Updates to fr_FR from Grégoire Ausina.
+
 2014-07-14  Carl Hetherington  <cth@carlh.net>
 
        * Bump libdcp to get a new version which writes
@@ -6,6 +39,7 @@
 2014-07-10  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.72.2 released.
+>>>>>>> origin/master
 
 2014-07-10  Carl Hetherington  <cth@carlh.net>