From: Carl Hetherington <cth@carlh.net>
Date: Wed, 16 Jul 2014 13:30:02 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into 2.0
X-Git-Tag: v2.0.48~718
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=94201bd2a5a4cb391b7f2bdeba56b928fed7cfe1

Merge remote-tracking branch 'origin/master' into 2.0
---

94201bd2a5a4cb391b7f2bdeba56b928fed7cfe1
diff --cc ChangeLog
index 68383d39d,a81046111..561bbce1c
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,19 -1,7 +1,21 @@@
 +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>
  
+ 	* Make KDM email subject configurable.
+ 
  	* Updates to de_DE from Carsten Kurz.
  
  	* Limit allowed KDM types based on Interop/SMPTE setting