X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=980bfba88561e77a83335562cddb0955619f9a09;hb=484974b2b941fbd7b94ab7164a73dd2660a3f06b;hp=8b0a5cd3e990b7cdcdc2410db8cfedadc78cd98b;hpb=6f25f88784f368163619d9eb0b27cdc2a7a6525f;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index 8b0a5cd3e..980bfba88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,120 @@
+2014-09-10  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.8 released.
+
+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 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>
+
+	* Version 2.0.5 released.
+
+2014-09-08  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.73.4 released.
+
+2014-09-08  Carl Hetherington  <cth@carlh.net>
+
+	* Fix failure to load Targa files.
+
+2014-09-07  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.73.3 released.
+
+2014-09-07  Carl Hetherington  <cth@carlh.net>
+
+	* Put no stretch / no scale in the set of choices for default
+	scale to.
+
+	* 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).
+
+2014-09-02  Carl Hetherington  <cth@carlh.net>
+
+	* Improve behaviour of batch converter window when it is shrunk (#338).
+
+2014-09-01  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.73.1 released.
+
+2014-08-31  Carl Hetherington  <cth@carlh.net>
+
+	* Remove configurable CPL <Creator> and use "DCP-o-matic (version) (git)"
+	instead.
+
+	* Fix lack of i18n of strings from src/lib/po on OS X.
+
+	* Give a hint when content and container aspect ratios are not
+	the same (#392).
+
+	* Add "copy" button to colour conversion presets editor (#399).
+
+	* Allow drag-and-drop of files onto the content list (#395).
+
+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>
+
+	* Version 1.73.0 released.
+
+2014-08-25  Carl Hetherington  <cth@carlh.net>
+
+	* Basic recent files list in the File menu.
+
 2014-08-23  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.72.12 released.
@@ -18,6 +135,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>
 
@@ -82,6 +200,7 @@
 2014-07-10  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.72.2 released.
+>>>>>>> origin/master
 
 2014-07-10  Carl Hetherington  <cth@carlh.net>