Fix merge.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 5fa276735942e64e87ef861e5b4e6518aa8c41f2..a98e4ffc00a775e8b8c938bc1af0c131fa41eb07 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+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.
+
 2016-03-08  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.6.39 released.