X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=ChangeLog;h=7fbd78e59cfa32b5d2570faa27616a04226413a2;hp=73236be9b7483e212370c3003c3108ca859d465a;hb=2c0478d2b33906845b9d910668b12fe3e8f03a7c;hpb=a3db88f2295d8d77b45de6ae56b3c3752d16518e

diff --git a/ChangeLog b/ChangeLog
index 73236be9b..7fbd78e59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-07  Carl Hetherington  <cth@carlh.net>
+
+	* Add subtitle view.
+
 2014-04-02  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.66.10 released.
@@ -54,6 +58,7 @@
 
 	* Another attempt to fix colour conversion dialog strange behaviour
 	on OS X.
+>>>>>>> master
 
 2014-03-18  Carl Hetherington  <cth@carlh.net>