Merge master.

1 files changed, 12 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 2782b563e..e8978daec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,18 @@
 
 	* 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.