X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=5265423fc06ef30e6e858a922562412046982c30;hb=fc56dc97103d00437843a31e1ef0c4915900ad1a;hp=65bfbe538a1b8a0da0974c22fb325486aa768869;hpb=ba37b5c74fbeb7fbda5359e2e4de4e0466a4c2eb;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index 65bfbe538..5265423fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,78 @@
+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>
+
+	* 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.
+
+2014-06-28  Carl Hetherington  <cth@carlh.net>
+
+	* Fix crash on analysing audio (and possibly DCP creation) with
+	resampled content.
+
 2014-06-27  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.71.0 released.
@@ -8,6 +83,17 @@
 
 2014-06-26  Carl Hetherington  <cth@carlh.net>
 
+	* Version 1.70.1 released.
+
+2014-06-26  Carl Hetherington  <cth@carlh.net>
+
+	* Support different KDM formulations.
+
+	* Allow override of detected video frame rates.
+
+	* Optimisation of uncertain effect to encoder and server
+	thread handling.
+
 	* Version 1.70.0 released.
 
 2014-06-25  Carl Hetherington  <cth@carlh.net>