Merge master.

diff --cc ChangeLog
index 2782b563e9eaf5a9178f257c7871fb8a46265932,818daeec2a92997e9a1c0ca8ccb20bdaab6be210..e8978daec22e180af55e5241064a234c25ee5c15
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,15 +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.

diff --cc src/lib/config.cc
index a0211386baf224d248543f13848f9fb3aaac58a4,8e6dffee73f51d08a42098bd47adecd539922529..bb1fcd21173655a276055bf0becdcc67527396b5
--- 1/src/lib/config.cc
--- 2/src/lib/config.cc
+++ b/src/lib/config.cc
@@@ -82,9 -79,11 +79,11 @@@ Config::Config (
        _allowed_dcp_frame_rates.push_back (50);
        _allowed_dcp_frame_rates.push_back (60);
  
 -      _colour_conversions.push_back (PresetColourConversion (_("sRGB"), 2.4, true, libdcp::colour_matrix::srgb_to_xyz, 2.6));
 -      _colour_conversions.push_back (PresetColourConversion (_("sRGB non-linearised"), 2.4, false, libdcp::colour_matrix::srgb_to_xyz, 2.6));
 -      _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, libdcp::colour_matrix::rec709_to_xyz, 2.6));
 +      _colour_conversions.push_back (PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6));
 +      _colour_conversions.push_back (PresetColourConversion (_("sRGB non-linearised"), 2.4, false, dcp::colour_matrix::srgb_to_xyz, 2.6));
 +      _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, dcp::colour_matrix::rec709_to_xyz, 2.6));
+ 
+       reset_kdm_email ();
  }
  
  void

diff --cc src/lib/config.h
Simple merge

diff --cc src/lib/kdm.cc
Simple merge

diff --cc src/wx/config_dialog.cc
Simple merge