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:
711dae5
81737f4
)
Merge commit '81737f42c28858dad76a40284a35f7a64faa2fc7'
author
Derek Buitenhuis
<derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 16:48:47 +0000
(16:48 +0000)
committer
Derek Buitenhuis
<derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 16:51:06 +0000
(16:51 +0000)
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Trivial merge