X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=ChangeLog;fp=ChangeLog;h=36a282919097ce8a2bd73f110cf54f7af97bb105;hp=e668225977d9c86550dae51bfb917ad395ffa83f;hb=22b9f3b2090d8bdfe52cda1e69d3acbe874f1ce5;hpb=3c7e1840081639ea5dc537c94baa13972a1987fd

diff --git a/ChangeLog b/ChangeLog
index e66822597..36a282919 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,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>
@@ -39,6 +66,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>
 
@@ -103,6 +131,7 @@
 2014-07-10  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.72.2 released.
+>>>>>>> origin/master
 
 2014-07-10  Carl Hetherington  <cth@carlh.net>