Merge.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 73236be9b7483e212370c3003c3108ca859d465a..7fbd78e59cfa32b5d2570faa27616a04226413a2 100644 (file)
--- 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>