Update Doxyfile for newer doxygen.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 4911adf1bd9a534212711ba1b0f565c19df5d348..38a8ea5ce01a929593fb280a30e2e505f7f22552 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
+2014-03-07  Carl Hetherington  <cth@carlh.net>
+
+       * Add subtitle view.
+
+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
@@ -99,6 +117,7 @@
 
        * Another attempt to fix colour conversion dialog strange behaviour
        on OS X.
+>>>>>>> master
 
 2014-03-18  Carl Hetherington  <cth@carlh.net>