Merge master.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index cd348ca76db227dfbb238a3bfb75ccc2e18e6221..e8978daec22e180af55e5241064a234c25ee5c15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2014-03-07  Carl Hetherington  <cth@carlh.net>
+
+       * Add subtitle view.
+
+2014-06-23  Carl Hetherington  <cth@carlh.net>
+
+       * Add option to CC a KDM email, and add
+       $SCREENS and $CINEMA_NAME as variables
+       in the email.
+
+2014-06-22  Carl Hetherington  <cth@carlh.net>
+
+       * Reset-to-default button for KDM email text.
+
+       * Version 1.69.35 released.
+
 2014-06-22  Carl Hetherington  <cth@carlh.net>
 
        * Fix large memory leak with image sources.