X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=b7e9ad74fd3c52fb23dc3f46727e1d9c542b61d8;hb=1dcfb3a26085ebb3703f40e2f51e43ce3d98be50;hp=6783464c64c2c89e1a601e383f08f9678ca723cc;hpb=6deca3038ff7a9f2067ff266a21133e8181c56ce;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index 6783464c6..b7e9ad74f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,152 @@
+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.
+
+2014-03-30  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.66.8 released.
+
+	* nl_NL translation from Theo Kooijmans.
+
+2014-03-27  Carl Hetherington  <cth@carlh.net>
+
+	* Auto-save film metadata before starting DCP encode.
+
+2014-03-25  Carl Hetherington  <cth@carlh.net>
+
+	* Add support for downloading Doremi server certificates.
+
+2014-03-24  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.66.7 released.
+
+2014-03-24  Carl Hetherington  <cth@carlh.net>
+
+	* Fix error on creating DCPs without audio.
+
+2014-03-23  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.66.6 released.
+
+2014-03-23  Carl Hetherington  <cth@carlh.net>
+
+	* Attempt to fix format string specifier error on Windows.
+
+	* Version 1.66.5 released.
+
+2014-03-22  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.66.4 released.
+
+2014-03-22  Carl Hetherington  <cth@carlh.net>
+
+	* Allow specification of the video frame rate that a sound file
+	was prepared for.
+
+	* Another attempt to fix colour conversion dialog strange behaviour
+	on OS X.
+>>>>>>> master
+
+2014-03-18  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.66.3 released.
+
+2014-03-18  Carl Hetherington  <cth@carlh.net>
+
+	* Fix bad rounding of timecodes.
+
+	* Tentative support for 3D from alternate frames of the source.
+
+2014-03-17  Carl Hetherington  <cth@carlh.net>
+
+	* Improve behaviour of the position slider at the end of films.
+
+	* Version 1.66.2 released.
+
+2014-03-17  Carl Hetherington  <cth@carlh.net>
+
+	* Improve appearance of config dialog on OS X.
+
 2014-03-15  Carl Hetherington  <cth@carlh.net>
 
 	* Improve appearance of new film and KDM dialogs on OS X.
@@ -12,7 +161,6 @@
 2014-03-12  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.66.1 released.
->>>>>>> 80faa28d7fd23ad811a9b837622f7e0cff1f2335
 
 2014-03-12  Carl Hetherington  <cth@carlh.net>