Merge master.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index c8a9ddf8b405abf92136c80b91c3494fec876669..b7e9ad74fd3c52fb23dc3f46727e1d9c542b61d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,83 @@
+2014-03-07  Carl Hetherington  <cth@carlh.net>
+
+       * Add subtitle view.
+
+2014-05-05  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.69.0 released.
+
+2014-05-02  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.68.0 released.
+
+2014-04-29  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.67.1 released.
+
+2014-04-29  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.67.0 released.
+
+2014-04-27  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.66.16 released.
+
+2014-04-27  Carl Hetherington  <cth@carlh.net>
+
+       * Add .dpx to the list of acceptable image files.
+
+       * Slightly better handling of uncaught exceptions.
+
+       * Use our own directory picker on 14.04 (as well as 13.04 and 13.10) as
+       it appears that the same bug remains.
+
+2014-04-25  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.66.15 released.
+
+2014-04-25  Carl Hetherington  <cth@carlh.net>
+
+       * Fix subtitle display when the next subtitle is decoded before the previous
+       one has finished.
+
+2014-04-24  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.66.14 released.
+
+2014-04-23  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.66.13 released.
+
+2014-04-21  Carl Hetherington  <cth@carlh.net>
+
+       * Update to es_ES translation from Manuel AC.
+
+       * Update to fr_FR translation from Thierry Journet.
+
+2014-04-17  Carl Hetherington  <cth@carlh.net>
+
+       * Fix update of the gain control when using the gain calculator
+       dialog.
+
+       * Version 1.66.12 released.
+
+2014-04-07  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.66.11 released.
+
+2014-04-07  Carl Hetherington  <cth@carlh.net>
+
+       * Updated fr_FR translation from Thierry Journet. 
+
+2014-04-02  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.66.10 released.
+
+2014-04-01  Carl Hetherington  <cth@carlh.net>
+
+       * Basic support for separate left/right-eye files or directories
+       for 3D.
+
 2014-03-30  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.66.9 released.
@@ -45,6 +125,7 @@
 
        * Another attempt to fix colour conversion dialog strange behaviour
        on OS X.
+>>>>>>> master
 
 2014-03-18  Carl Hetherington  <cth@carlh.net>