X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=1bbaed6e5222024718f96bbe4e6c900e3625d9c1;hb=7f2e74604a51b984e4c8cbb5d5f4bb642677ec00;hp=af03d17013bb7cc79530f07f72b2c589b09b3c01;hpb=4447443c6a7cec1c4d68285ab98ad4e1c27abe6d;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index af03d1701..1bbaed6e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,49 @@
+2014-03-07  Carl Hetherington  <cth@carlh.net>
+
+	* Add subtitle view.
+
+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.
 
-	Reported-by: Andy Neddermeyer
+	* Version 1.66.12 released.
 
 2014-04-07  Carl Hetherington  <cth@carlh.net>
 
@@ -69,6 +109,7 @@
 
 	* Another attempt to fix colour conversion dialog strange behaviour
 	on OS X.
+>>>>>>> master
 
 2014-03-18  Carl Hetherington  <cth@carlh.net>