Merge master.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index cf6058454fc07a6b5d916982f018921b388231bb..04eb830f5e7451aef832fbf8e2d458dd6be9e2ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-07  Carl Hetherington  <cth@carlh.net>
+
+       * Add subtitle view.
+
 2014-04-07  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.66.11 released.
@@ -62,6 +66,7 @@
 
        * Another attempt to fix colour conversion dialog strange behaviour
        on OS X.
+>>>>>>> master
 
 2014-03-18  Carl Hetherington  <cth@carlh.net>