OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 808c10e fa515c2)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Nov 2013 16:29:11 +0000 (17:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Nov 2013 16:29:11 +0000 (17:29 +0100)
* qatar/master:
  doc/platform: Update to reflect current MSVC build situation

Conflicts:
doc/platform.texi

See: ec0b0c2b5875e4cb58ea19f82db6574774256e9d
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge
external/ffmpeg
About OSDN
Find Software
Develop Software
Help