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:
5a8b4ed
10d9824
)
Merge remote-tracking branch 'qatar/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 23 Dec 2013 12:04:02 +0000
(13:04 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 23 Dec 2013 12:05:44 +0000
(13:05 +0100)
* qatar/master:
lavu: fix typo in documentation.
See:
e53061154f42cda93052a2f558e1c4697e3b0c1a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge