From: Carl Hetherington <cth@carlh.net>
Date: Tue, 8 Jul 2014 08:13:48 +0000 (+0100)
Subject: Merge master.
X-Git-Tag: v2.0.48~751
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=73f52e94953848c696725defd3d7f5c4c30707e2

Merge master.
---

73f52e94953848c696725defd3d7f5c4c30707e2
diff --cc ChangeLog
index 12d262f4b,c4e689b64..b59b94c8c
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
 +2014-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +	* Add subtitle view.
 +
+ 2014-07-02  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Updated de_DE translation from Carsten Kurz.
+ 
  2014-06-30  Carl Hetherington  <cth@carlh.net>
  
  	* Version 1.72.0 released.