From: Carl Hetherington <cth@carlh.net>
Date: Tue, 8 Mar 2016 10:36:44 +0000 (+0000)
Subject: Fix merge.
X-Git-Tag: v2.7.2~9
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=0f3c2864599f9e5a5ec001266b4aefb0205d1e1f

Fix merge.
---

0f3c2864599f9e5a5ec001266b4aefb0205d1e1f
diff --cc ChangeLog
index 897e1f0f7,89472fec5..a98e4ffc0
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,7 +1,10 @@@
  2016-03-08  Carl Hetherington  <cth@carlh.net>
  
 +	* Store time zone with cinemas and use them to
 +	mark KDM start and end times correctly (#788).
 +
+ 	* Bump ffmpeg to git master, somewhere post 3.0.
+ 
  2016-03-08  Carl Hetherington  <cth@carlh.net>
  
  	* Version 2.7.0 released.