diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-27 17:29:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-27 17:29:11 +0100 |
| commit | b723c4e67e20eb86673316cb944184d0f3f6fe5e (patch) | |
| tree | 4caa4c7dd12a17309089fb1db9cb7028036fc31d | |
| parent | 808c10e728db2d92ccbb0f8b3bcd4a2f4305a2cf (diff) | |
| parent | fa515c2088e1d082d45741bbd5c05e13b0500804 (diff) | |
| download | ffmpeg-b723c4e67e20eb86673316cb944184d0f3f6fe5e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc/platform: Update to reflect current MSVC build situation
Conflicts:
doc/platform.texi
See: ec0b0c2b5875e4cb58ea19f82db6574774256e9d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions