Merge master.

[dcpomatic.git] / ChangeLog

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