git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ea79dfb
7813e67
)
Merge commit '7813e6752bdab38a5686c301e869ee71d97bce69'
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 18 Nov 2014 19:33:37 +0000
(20:33 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 18 Nov 2014 19:33:37 +0000
(20:33 +0100)
* commit '
7813e6752bdab38a5686c301e869ee71d97bce69
':
configure: Fix enabling memalign_hack automatically
Conflicts:
configure
See:
3d93ba562243b6d8afac3c875c05304d41da94bf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge