X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=ca321f9720eb0e0055b13ff470d1be2832051a10;hb=cb1dfa9ec09af2abf6d10e4bf2764476db83841b;hp=54188c26a4f9f5da4f894bd9db761c4a761de959;hpb=8407612363705f757d3ab26d6e119171c217b00a;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index 54188c26a..ca321f972 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-09-03  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.73.2 released.
+
+2014-09-03  Carl Hetherington  <cth@carlh.net>
+
+	* Fix server certificate downloads on OS X (#376).
+
 2014-09-02  Carl Hetherington  <cth@carlh.net>
 
 	* Improve behaviour of batch converter window when it is shrunk (#338).
@@ -22,6 +30,33 @@
 
 2014-08-29  Carl Hetherington  <cth@carlh.net>
 
+	* Version 2.0.4 released.
+
+2014-08-24  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.3 released.
+
+2014-08-24  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.2 released.
+
+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.
 	* Some improvements to the manual.
 
 2014-08-26  Carl Hetherington  <cth@carlh.net>
@@ -52,6 +87,7 @@
 	* Attempt to fix random crashes on OS X (especially during encodes)
 	thought to be caused by multiple threads using (different) stringstreams
 	at the same time; see src/lib/safe_stringstream.
+>>>>>>> origin/master
 
 2014-08-09  Carl Hetherington  <cth@carlh.net>
 
@@ -116,6 +152,7 @@
 2014-07-10  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.72.2 released.
+>>>>>>> origin/master
 
 2014-07-10  Carl Hetherington  <cth@carlh.net>