Merge master.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index f676d6b99dea3a4e6163b193d8ffdca43b1c559e..a8927a5471b975ca4ef4b64761403e5b42e5fa32 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-09-22  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.0.11 released.
+
+2014-09-18  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.0.10 released.
+
 2014-09-28  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.73.8 released.
@@ -28,6 +36,19 @@
 
 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>
@@ -37,17 +58,38 @@
 
        * Fix hidden advanced preferences button in some locales.
 
-2014-09-08  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>
 
-       * Version 1.73.4 released.
+       * 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>
 
@@ -56,10 +98,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).
@@ -88,6 +126,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>
@@ -118,6 +183,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>
 
@@ -182,6 +248,7 @@
 2014-07-10  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.72.2 released.
+>>>>>>> origin/master
 
 2014-07-10  Carl Hetherington  <cth@carlh.net>