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:
d1dc0d2
e61b8fa
)
Merge remote-tracking branch 'qatar/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 6 Jan 2014 16:41:54 +0000
(17:41 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 6 Jan 2014 16:41:54 +0000
(17:41 +0100)
* qatar/master:
configure: Update freetype check to follow upstream
Conflicts:
configure
Not merged, as its broken (Reported by ubitux)
See:
cea5812fa723c08b89d929eeba73462e05de2973
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge