X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=ChangeLog;fp=ChangeLog;h=89185d4e62fca3f08dab100a666b55988d9156e1;hp=a529f6a810154307fe5ff0f342704b355c2bcdb0;hb=6de35d058821acc092d2aae75543024a97026b8a;hpb=e01961397fbf87c69da4c8a8e79cef3c16480d3a

diff --git a/ChangeLog b/ChangeLog
index a529f6a81..89185d4e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,18 +1,37 @@
 2014-09-10  Carl Hetherington  <cth@carlh.net>
 
-	* Fix hidden advanced preferences button in some locales.
+	* Version 2.0.8 released.
 
-2014-09-08  Carl Hetherington  <cth@carlh.net>
+2014-09-10  Carl Hetherington  <cth@carlh.net>
+
+	* Fix loading of 1.x films.
+
+	* Fix crash on audio analysis in some cases.
+
+2014-09-09  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.7 released.
+
+2014-09-09  Carl Hetherington  <cth@carlh.net>
 
-	* Version 1.73.4 released.
+	* Version 2.0.6 released.
+
+2014-09-09  Carl Hetherington  <cth@carlh.net>
+
+	* Fix missing OS X dependencies.
+
+	* Use a different directory for DCP-o-matic 2
+	configuration (not the same as 1.x).
 
 2014-09-08  Carl Hetherington  <cth@carlh.net>
 
-	* Fix failure to load Targa files.
+	* Version 2.0.5 released.
 
-2014-09-07  Carl Hetherington  <cth@carlh.net>
+	* Fix hidden advanced preferences button in some locales.
 
-	* Version 1.73.3 released.
+2014-09-08  Carl Hetherington  <cth@carlh.net>
+
+	* Fix failure to load Targa files.
 
 2014-09-07  Carl Hetherington  <cth@carlh.net>
 
@@ -21,10 +40,6 @@
 
 	* Fix a few bad fuzzy translations from the preferences dialog.
 
-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).
@@ -53,6 +68,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>
@@ -83,6 +125,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>
 
@@ -147,6 +190,7 @@
 2014-07-10  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.72.2 released.
+>>>>>>> origin/master
 
 2014-07-10  Carl Hetherington  <cth@carlh.net>