X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=b7e9ad74fd3c52fb23dc3f46727e1d9c542b61d8;hb=1dcfb3a26085ebb3703f40e2f51e43ce3d98be50;hp=d8307c4f5c3815cf20321f4377448ed7e4e3197b;hpb=9c1e0071803bf05f8c476d870e360c9e320ba696;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index d8307c4f5..b7e9ad74f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+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.
+
+2014-04-29  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.67.1 released.
+
+2014-04-29  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.67.0 released.
+
+2014-04-27  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.66.16 released.
+
+2014-04-27  Carl Hetherington  <cth@carlh.net>
+
+	* Add .dpx to the list of acceptable image files.
+
+	* Slightly better handling of uncaught exceptions.
+
+	* Use our own directory picker on 14.04 (as well as 13.04 and 13.10) as
+	it appears that the same bug remains.
+
+2014-04-25  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.66.15 released.
+
 2014-04-25  Carl Hetherington  <cth@carlh.net>
 
 	* Fix subtitle display when the next subtitle is decoded before the previous
@@ -88,6 +125,7 @@
 
 	* Another attempt to fix colour conversion dialog strange behaviour
 	on OS X.
+>>>>>>> master
 
 2014-03-18  Carl Hetherington  <cth@carlh.net>