X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=38a8ea5ce01a929593fb280a30e2e505f7f22552;hb=034feb503b0a38eb82c21ae8d9f83522fc63a25c;hp=481c5a7471ee5cf15030089f1f27b6c1f2b53b9a;hpb=ae8601eac6fd6f8437f63c0e5f940ac8930a3972;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index 481c5a747..38a8ea5ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,109 @@
+2014-03-07  Carl Hetherington  <cth@carlh.net>
+
+	* Add subtitle view.
+
+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>
@@ -13,6 +117,7 @@
 
 	* Another attempt to fix colour conversion dialog strange behaviour
 	on OS X.
+>>>>>>> master
 
 2014-03-18  Carl Hetherington  <cth@carlh.net>