From: Carl Hetherington <cth@carlh.net>
Date: Thu, 17 Jul 2014 09:45:16 +0000 (+0100)
Subject: Merge master.
X-Git-Tag: v2.0.48~714
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=d2137ac5db409e686b4d9b3fa567935a5e416d41

Merge master.
---

d2137ac5db409e686b4d9b3fa567935a5e416d41
diff --cc ChangeLog
index a15a44fe2,e550ddf3f..0a1f804b9
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,17 -1,14 +1,28 @@@
 +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-17  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Fix corrupted text in job descriptions in some cases.
+ 
+ 	* Speculative fix for failure to keep Windows
+ 	machines awake during encodes.
+ 
+ 2014-07-16  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Version 1.72.4 released.
+ 
  2014-07-16  Carl Hetherington  <cth@carlh.net>
  
  	* Add default scaling setting to preferences (#384).