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

diff --git a/ChangeLog b/ChangeLog
index b7daf3e0c..68383d39d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,24 @@
+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>
@@ -10,6 +29,7 @@
 2014-07-10  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.72.2 released.
+>>>>>>> origin/master
 
 2014-07-10  Carl Hetherington  <cth@carlh.net>