git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
edf9304
0823570
)
Merge remote-tracking branch 'cehoyos/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 15 Jun 2014 23:38:44 +0000
(
01:38
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 15 Jun 2014 23:38:48 +0000
(
01:38
+0200)
* cehoyos/master:
Do not suggest to use gas-preprocessor on aix where it doesn't work.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge