X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=68383d39dff7be7c3031e88633b3da2155a5b74e;hb=9e4c091e6ef0f79fab10664e95240de2f14e5702;hp=b59b94c8cd70913d8a74bef9cb93ea8cdef3d621;hpb=73f52e94953848c696725defd3d7f5c4c30707e2;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index b59b94c8c..68383d39d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,49 @@
+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>
+
+	* 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.