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

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