Changeset b723c4e6 in ffmpeg

Timestamp:
Nov 27, 2013, 4:29:11 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
ca21116b
Parents:
808c10e (diff), fa515c20 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

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>

(No files)

Note: See TracChangeset for help on using the changeset viewer.