git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
17498b7
c8b8271
)
Merge commit 'c8b8271379b200c5c6fa89ca995f90f97f55c2c5'
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 8 Jul 2015 22:20:10 +0000
(
00:20
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 8 Jul 2015 22:21:28 +0000
(
00:21
+0200)
* commit '
c8b8271379b200c5c6fa89ca995f90f97f55c2c5
':
xcbgrab: Explicitly include xcb/shape.h
See:
54170a33c2c97b0f50347f57e8f0f2ea681dca1d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge