X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=ChangeLog;fp=ChangeLog;h=d25196832ee9985848b7f841895e5398dfd4f16d;hp=884f384bbb7350c600b8baea8746da750199ddba;hb=04eebe07e2f64bd15f6887a10ab51fb92c52901a;hpb=97a1a713078f151d1b68b6f256a5b885e7733a92

diff --git a/ChangeLog b/ChangeLog
index 884f384bb..d25196832 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-08-04  Carl Hetherington  <cth@carlh.net>
 
 	* Add BCC option for KDM emails.
@@ -44,6 +58,7 @@
 2014-07-10  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.72.2 released.
+>>>>>>> origin/master
 
 2014-07-10  Carl Hetherington  <cth@carlh.net>