X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=b7e9ad74fd3c52fb23dc3f46727e1d9c542b61d8;hb=1dcfb3a26085ebb3703f40e2f51e43ce3d98be50;hp=6eb3bcff0e2ddb5daad595f67bab968a52bb951b;hpb=18af438ee543d00e9e3a692fda61a2fe08f6d1e9;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index 6eb3bcff0..b7e9ad74f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-03-07  Carl Hetherington  <cth@carlh.net>
+
+	* Add subtitle view.
+
+2014-05-05  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.69.0 released.
+
 2014-05-02  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.68.0 released.
@@ -117,6 +125,7 @@
 
 	* Another attempt to fix colour conversion dialog strange behaviour
 	on OS X.
+>>>>>>> master
 
 2014-03-18  Carl Hetherington  <cth@carlh.net>