git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
60058c1
83aa4fc
)
Merge commit '83aa4fc3feec7389ac781fece1e994f2dfd7ebdb'
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 16 Jun 2014 11:13:21 +0000
(13:13 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 16 Jun 2014 11:13:47 +0000
(13:13 +0200)
* commit '
83aa4fc3feec7389ac781fece1e994f2dfd7ebdb
':
configure: Directly support Android as target OS
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1
2
configure
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
configure
Simple merge