Fix merge.
authorCarl Hetherington <cth@carlh.net>
Mon, 17 Oct 2016 13:39:08 +0000 (14:39 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 17 Oct 2016 13:39:08 +0000 (14:39 +0100)
1  2 
ChangeLog

diff --cc ChangeLog
index a8d82999bf05a9e1d9050ff4ec0abc90eec8efa0,78f13199db48dd8f2fc16d5455dee9d1450b3dfe..be2c38a0ccb2be54a6daa21ff567f1c8dfd98b0f
+++ 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.