From: Carl Hetherington <cth@carlh.net>
Date: Tue, 7 Mar 2017 10:18:31 +0000 (+0000)
Subject: Merge.
X-Git-Tag: v2.11.1~152
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=e340b96b4a33725e70e3703b0c60ba8da95bca3b

Merge.
---

e340b96b4a33725e70e3703b0c60ba8da95bca3b
diff --cc ChangeLog
index f7e10cc3e,5e38fc742..19cd66c71
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,8 +1,12 @@@
 +2017-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +	* Handle failure to write to cinemas file more nicely.
 +
+ 2017-03-03  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Add option to write KDMs to separate folders
+ 	or ZIP files.
+ 
  2017-02-28  Carl Hetherington  <cth@carlh.net>
  
  	* Updated de_DE translation from Carsten Kurz.