From: Carl Hetherington <cth@carlh.net>
Date: Wed, 9 Apr 2014 08:20:49 +0000 (+0100)
Subject: Merge master.
X-Git-Tag: v2.0.48~877
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=b666a794a130386bc01ede2143ef40bd6973eb32

Merge master.
---

b666a794a130386bc01ede2143ef40bd6973eb32
diff --cc ChangeLog
index 7fbd78e59,cf6058454..04eb830f5
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,11 +1,15 @@@
 +2014-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +	* Add subtitle view.
 +
+ 2014-04-07  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Version 1.66.11 released.
+ 
+ 2014-04-07  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Updated fr_FR translation from Thierry Journet. 
+ 
  2014-04-02  Carl Hetherington  <cth@carlh.net>
  
  	* Version 1.66.10 released.