Merge master.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 00d83bf5906a347419607beabae8f2163b709f3a..38a8ea5ce01a929593fb280a30e2e505f7f22552 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-07  Carl Hetherington  <cth@carlh.net>
+
+       * Add subtitle view.
+
 2014-04-29  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.67.1 released.
@@ -113,6 +117,7 @@
 
        * Another attempt to fix colour conversion dialog strange behaviour
        on OS X.
+>>>>>>> master
 
 2014-03-18  Carl Hetherington  <cth@carlh.net>