X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=fe281428425795f7c86cf586e95d28215e6eab0a;hb=4ddf91dda7d84f169e4b905fd41cf747f4a0102c;hp=e225fb565697a99a1a453ed0e9a483af8f918a6b;hpb=5c6191a5a154e60ae8a1be8b09372be183c1a520;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index e225fb565..fe2814284 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+2014-08-06  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.1 released.
+
+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.
+
+2014-07-29  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.72.5 released.
+
+2014-07-17  Carl Hetherington  <cth@carlh.net>
+
+	* Fix corrupted text in job descriptions in some cases.
+
+	* Speculative fix for failure to keep Windows
+	machines awake during encodes.
+
+2014-07-16  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.72.4 released.
+
 2014-07-16  Carl Hetherington  <cth@carlh.net>
 
 	* Add default scaling setting to preferences (#384).
@@ -25,6 +62,7 @@
 2014-07-10  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.72.2 released.
+>>>>>>> origin/master
 
 2014-07-10  Carl Hetherington  <cth@carlh.net>