X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=1d3ee28fa067027dbc1a5e236160be18151cd498;hb=854f2e5bbb7ffb9758b823af87034033033f3cb8;hp=23b2b23c4d04146889430dd459c03c2b8c634b51;hpb=6e7a497e9802635de713e350593b12c783a0f64c;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index 23b2b23c4..1d3ee28fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,52 @@
+2014-03-07  Carl Hetherington  <cth@carlh.net>
+
+	* Add subtitle view.
+
+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
@@ -5,6 +54,7 @@
 
 	* Another attempt to fix colour conversion dialog strange behaviour
 	on OS X.
+>>>>>>> master
 
 2014-03-18  Carl Hetherington  <cth@carlh.net>