diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-03-08 10:36:44 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-03-08 10:36:44 +0000 |
| commit | 0f3c2864599f9e5a5ec001266b4aefb0205d1e1f (patch) | |
| tree | 2158a8f135e4a196b784df285db008e5ec2439e5 /ChangeLog | |
| parent | bdae32bb84672026c1a373e809804109e95accf4 (diff) | |
| parent | a2668dcfc484e5e2b158bd3b51b835a96660c8d8 (diff) | |
Fix merge.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -3,6 +3,8 @@ * 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. |