OSDN Git Service

(root) / coroid / ffmpeg_saccubus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b5ddf0 8a54bfe)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Jul 2011 22:34:34 +0000 (00:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Jul 2011 22:34:47 +0000 (00:34 +0200)
* qatar/master:
  build: make examples build normally

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
subdir.mak patch | diff1 | diff2 | blob | history

diff --cc subdir.mak
Simple merge
さきゅばす/いんきゅばす用ffmpeg
About OSDN
Find Software
Develop Software
Help