projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bdae32b
a2668dc
)
Fix merge.
author
Carl Hetherington
<cth@carlh.net>
Tue, 8 Mar 2016 10:36:44 +0000
(10:36 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 8 Mar 2016 10:36:44 +0000
(10:36 +0000)
1
2
ChangeLog
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
ChangeLog
index 897e1f0f70d09dedad41ef28c509ef0684874c3a,89472fec5e63969cf7205628123fa1fda8fd6297..a98e4ffc00a775e8b8c938bc1af0c131fa41eb07
---
1
/
ChangeLog
---
2
/
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.