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:
00f25e0
9409c9b
)
Merge commit '9409c9bdbfd829353473ee6cc3e91c726481c069'
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 6 Jan 2014 21:24:47 +0000
(22:24 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 6 Jan 2014 21:25:34 +0000
(22:25 +0100)
* commit '
9409c9bdbfd829353473ee6cc3e91c726481c069
':
configure: Disable networking if winsock2.h is available but winsock functions aren't
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1
2
configure
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
configure
Simple merge