X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=561bbce1c06f1ce981512e41413408902d952f8a;hb=94201bd2a5a4cb391b7f2bdeba56b928fed7cfe1;hp=67a818f3e15cdfca381d510e5c6acfce7f0fb3fd;hpb=a6b3b4539ae17ce59f975a4be49278f4ccc736fd;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index 67a818f3e..561bbce1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,55 @@
+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>
+
+	* 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.