From: Carl Hetherington <cth@carlh.net>
Date: Mon, 17 Oct 2016 13:39:08 +0000 (+0100)
Subject: Fix merge.
X-Git-Tag: v2.9.36~1
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=894d6e4cbfab5217adf6f39b1c097cec2a8f948c

Fix merge.
---

894d6e4cbfab5217adf6f39b1c097cec2a8f948c
diff --cc ChangeLog
index a8d82999b,78f13199d..be2c38a0c
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,7 +1,12 @@@
 +2016-10-17  c.hetherington  <cth@carlh.net>
 +
 +	* Bump libdcp for fix to corrupted audio analyses
 +	under some locales (#974).
 +
+ 2016-10-15  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Version 2.9.35 released.
+ 
  2016-10-14  Carl Hetherington  <cth@carlh.net>
  
  	* Version 2.9.34 released.