From: Carl Hetherington <cth@carlh.net>
Date: Thu, 10 Jul 2014 19:38:28 +0000 (+0100)
Subject: Merge master.
X-Git-Tag: v2.0.48~734
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=8d58a7c5f4320ad5c111e336c45e44d6b51ab509

Merge master.
---

8d58a7c5f4320ad5c111e336c45e44d6b51ab509
diff --cc ChangeLog
index b59b94c8c,fee8a50f3..61f558dcc
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,16 +1,20 @@@
 +2014-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +	* Add subtitle view.
 +
+ 2014-07-10  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Try to fix corruption of KDM email setting in
+ 	some cases.
+ 
+ 	* Version 1.72.1 released.
+ 
+ 2014-07-08  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Fix various problems with seek and content
+ 	being trimmed when its video frame rate is
+ 	overridden.
+ 
  2014-07-02  Carl Hetherington  <cth@carlh.net>
  
  	* Updated de_DE translation from Carsten Kurz.