X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=0a1f804b93789b8ac1ad807443f0ba0f33ea22d1;hb=d2137ac5db409e686b4d9b3fa567935a5e416d41;hp=9dfed5d601da0f12335deded61856b8d689acdea;hpb=68c3938675624b4795271f1da7fb4f973b911de2;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index 9dfed5d60..0a1f804b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,82 @@
+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-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).
+
+	* 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
+	<Hash> values to CPLs.
+
+2014-07-10  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.72.2 released.
+>>>>>>> origin/master
+
+2014-07-10  Carl Hetherington  <cth@carlh.net>
+
+	* Try to fix corruption of KDM email setting in
+	some cases.
+
+	* Version 1.72.1 released.
+
+2014-07-08  Carl Hetherington  <cth@carlh.net>
+
+	* Fix various problems with seek and content
+	being trimmed when its video frame rate is
+	overridden.
+
+2014-07-02  Carl Hetherington  <cth@carlh.net>
+
+	* Updated de_DE translation from Carsten Kurz.
+
+2014-06-30  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.72.0 released.
+
+2014-06-28  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.71.2 released.
+
 2014-06-28  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.71.1 released.