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

diff --git a/ChangeLog b/ChangeLog
index f96ba701e..fe2814284 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,52 @@
+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).
+
+	* Version 1.72.3 released.
+
+2014-07-16  Carl Hetherington  <cth@carlh.net>
+
+	* Improve approximate time reports a bit.
+
+	* Make KDM email subject configurable.
+
 	* Updates to de_DE from Carsten Kurz.
 
 	* Limit allowed KDM types based on Interop/SMPTE setting
@@ -15,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>