X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=65518b42bab72e50893d9e7dc899000381ad9914;hb=1c13441a19aa387ddd8ac0c972207ccbbe3114d8;hp=9314e40660a131a4b42a830f872e8f00e734380d;hpb=e50e596448d17f32652a8215a01ae62a32c9afea;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index 9314e4066..65518b42b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,95 @@
+2014-09-16  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.73.7 released.
+
+2014-09-16  Carl Hetherington  <cth@carlh.net>
+
+	* Fix non-update of audio gain when changing selected content.
+
+2014-09-14  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.73.6 released.
+
+2014-09-14  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.73.5 released.
+
+2014-09-14  Carl Hetherington  <cth@carlh.net>
+
+	* Update to nl_NL translation from Cherif Ben Brahim.
+
+2014-09-12  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.9 released.
+
+2014-09-12  Carl Hetherington  <cth@carlh.net>
+
+	* Add "re-examine" option to content context menu (#339).
+
+2014-09-11  Carl Hetherington  <cth@carlh.net>
+
+	* Restore encoding optimisations for still-image sources.
+
+	* Add option to re-make signing chain with specified organisation,
+	common names etc. (#354)
+
+	* Allow separate X and Y scale for subtitles (#337).
+
+2014-09-10  Carl Hetherington  <cth@carlh.net>
+
+	* Allow DCP names to be created using the ISDCF template and then
+	edited afterwards (#401).
+
+	* Fix hidden advanced preferences button in some locales.
+
+	* 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.
+
+	* Fix hidden advanced preferences button in some locales.
+
+2014-09-08  Carl Hetherington  <cth@carlh.net>
+
+	* Fix failure to load Targa files.
+
+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>
+
+	* 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.
@@ -18,6 +110,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>
@@ -48,6 +167,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>
 
@@ -112,6 +232,7 @@
 2014-07-10  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.72.2 released.
+>>>>>>> origin/master
 
 2014-07-10  Carl Hetherington  <cth@carlh.net>