X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ChangeLog;h=0a1f804b93789b8ac1ad807443f0ba0f33ea22d1;hb=d2137ac5db409e686b4d9b3fa567935a5e416d41;hp=e550ddf3fb1f61f9aa4484bf2f325fbcb431d066;hpb=d12a848916fb4fab0d1a14c6e72cfc0c8139255a;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index e550ddf3f..0a1f804b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+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.
@@ -36,6 +50,7 @@
 2014-07-10  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.72.2 released.
+>>>>>>> origin/master
 
 2014-07-10  Carl Hetherington  <cth@carlh.net>