Merge master.

diff --cc ChangeLog
index 1f84ff13a1364cdb3e379edde921d8166f9ed2c9,f96ba701ed400b91ee2f99cff48c5bddcd0ab518..68383d39dff7be7c3031e88633b3da2155a5b74e
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,17 -1,21 +1,36 @@@
-       
 +2014-07-15  Carl Hetherington  <cth@carlh.net>
 +
 +      * A variety of changes were made on the 2.0 branch
 +      but not documented in the ChangeLog.  Most sigificantly:
++
 +      - DCP import
 +      - Creation of DCPs with proper XML subtitles
 +      - Import of .srt and .xml subtitles
 +      - Audio processing framework (with some basic processors).
 +
 +2014-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +      * Add subtitle view.
 +
+ 2014-07-16  Carl Hetherington  <cth@carlh.net>
+ 
+       * Updates to de_DE from Carsten Kurz.
+ 
+       * Limit allowed KDM types based on Interop/SMPTE setting
+       of DCP (#385).
+ 
+       * Updates to fr_FR from Grégoire Ausina.
+ 
+ 2014-07-14  Carl Hetherington  <cth@carlh.net>
+ 
+       * Bump libdcp to get a new version which writes
+       <Hash> values to CPLs.
+ 
+ 2014-07-10  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.72.2 released.
++>>>>>>> origin/master
+ 
  2014-07-10  Carl Hetherington  <cth@carlh.net>
  
        * Try to fix corruption of KDM email setting in

diff --cc cscript
Simple merge

diff --cc platform/windows/wscript
Simple merge

diff --cc src/lib/wscript
index 66a25be0af71bd187641087d9215205555b97e4b,6d563f255ccb5c100496ec15d7152d43d54e5a00..7d74d462ce90719b7c839525aeed9c19c1c88208
--- 1/src/lib/wscript
--- 2/src/lib/wscript
+++ b/src/lib/wscript
@@@ -103,8 -83,8 +103,8 @@@ def build(bld)
      obj.uselib = """
                   AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE 
                   BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2
 -                 SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XMLPP
 -                 CURL ZIP QUICKMAIL XMLSEC
 +                 SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
-                  CURL ZIP QUICKMAIL PANGOMM CAIROMM
++                 CURL ZIP QUICKMAIL PANGOMM CAIROMM XMLSEC
                   """
  
      if bld.env.TARGET_OSX:

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

diff --cc src/wx/kdm_dialog.cc
index 0fdb1fe5051eda24adf941bde7eeafbc287ddddf,a7af7978ca48b65aba8629651917d9cfcbb51892..6ef630eff39f5a29cb39a88ed7cb8952e8698d26
--- 1/src/wx/kdm_dialog.cc
--- 2/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@@ -488,19 -490,10 +490,10 @@@ KDMDialog::write_to () cons
        return _write_to->GetValue ();
  }
  
 -libdcp::KDM::Formulation
 +dcp::Formulation
  KDMDialog::formulation () const
  {
-       switch (_type->GetSelection()) {
-       case 0:
-               return dcp::MODIFIED_TRANSITIONAL_1;
-       case 1:
-               return dcp::DCI_ANY;
-       case 2:
-               return dcp::DCI_SPECIFIC;
-       default:
-               assert (false);
-       }
 -      return (libdcp::KDM::Formulation) reinterpret_cast<long int> (_type->GetClientData (_type->GetSelection()));
++      return (dcp::KDM::Formulation) reinterpret_cast<long int> (_type->GetClientData (_type->GetSelection()));
  }
  
  void

diff --cc src/wx/wscript
Simple merge

diff --cc wscript
index df839a96befcd1087d2ad00c445ac71fb077d9b4,ef72a61e5e2d2677b9596ddcde16c980b40ad722..681654bb8d0acd4fd571866bee3d02fcdedba0e8
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -56,9 -58,9 +58,13 @@@ def dynamic_openjpeg(conf)
      conf.check_cfg(package='libopenjpeg', args='--cflags --libs', max_version='1.5.2', mandatory=True)
  
  def static_dcp(conf, static_boost, static_xmlpp, static_xmlsec, static_ssh):
++<<<<<<< HEAD
 +    conf.check_cfg(package='libdcp-1.0', atleast_version='0.95', args='--cflags', uselib_store='DCP', mandatory=True)
++=======
+     conf.check_cfg(package='libdcp', atleast_version='0.96', args='--cflags', uselib_store='DCP', mandatory=True)
++>>>>>>> origin/master
      conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
 -    conf.env.STLIB_DCP = ['dcp', 'asdcp-libdcp', 'kumu-libdcp']
 +    conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-libdcp-1.0', 'kumu-libdcp-1.0']
      conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
  
      if static_boost: