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

diff --git a/ChangeLog b/ChangeLog
index 62777b4d2..5265423fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+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.
@@ -19,6 +37,7 @@
 2014-07-10  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.72.2 released.
+>>>>>>> origin/master
 
 2014-07-10  Carl Hetherington  <cth@carlh.net>