Merge master.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index c3d8a77c4877479c5657c6ab756968faefa5f22d..ca321f9720eb0e0055b13ff470d1be2832051a10 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,68 @@
+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.
@@ -22,6 +87,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>
 
@@ -86,6 +152,7 @@
 2014-07-10  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.72.2 released.
+>>>>>>> origin/master
 
 2014-07-10  Carl Hetherington  <cth@carlh.net>