OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
41b394b
92e6b31
)
Merge commit '92e6b31c3b31be5d6fcad6bf0030bea86a1c8360'
author
James Almer
<jamrial@gmail.com>
Thu, 13 Apr 2017 22:57:31 +0000
(19:57 -0300)
committer
James Almer
<jamrial@gmail.com>
Thu, 13 Apr 2017 22:58:37 +0000
(19:58 -0300)
* commit '
92e6b31c3b31be5d6fcad6bf0030bea86a1c8360
':
dxva2: Adjust multiple inclusion guard names to follow convention
This commit is a noop, see
180f9a09588d1c68983692bb5245213956fdde11
Merged-by: James Almer <jamrial@gmail.com>
Trivial merge