Merge master.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 729a335def35e801d57578088cff62afa732ec22..b7e9ad74fd3c52fb23dc3f46727e1d9c542b61d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-07  Carl Hetherington  <cth@carlh.net>
+
+       * Add subtitle view.
+
 2014-05-05  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.69.0 released.
@@ -121,6 +125,7 @@
 
        * Another attempt to fix colour conversion dialog strange behaviour
        on OS X.
+>>>>>>> master
 
 2014-03-18  Carl Hetherington  <cth@carlh.net>