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:
86b3435
e8fcdeb
)
Merge commit 'e8fcdebb17fc59375fd9fc6c0a02a1d2e6d9fb23'
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 15 Nov 2013 11:19:23 +0000
(12:19 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 15 Nov 2013 11:19:45 +0000
(12:19 +0100)
* commit '
e8fcdebb17fc59375fd9fc6c0a02a1d2e6d9fb23
':
build: Allow specifying extra object files when linking HOSTPROGS
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1
2
common.mak
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
common.mak
Simple merge