[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Wed Nov 27 17:34:34 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Nov 27 17:29:11 2013 +0100| [b723c4e67e20eb86673316cb944184d0f3f6fe5e] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b723c4e67e20eb86673316cb944184d0f3f6fe5e
---
More information about the ffmpeg-cvslog
mailing list