Changeset 877cae6e in ffmpeg

Timestamp:

May 21, 2013, 9:36:49 AM (12 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

6ef7b6af

Parents:

3b071a4 (diff), c209d0df (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 commit 'c209d0df657f172f42d9bafbcdfa02dfb14f6965'

• commit 'c209d0df657f172f42d9bafbcdfa02dfb14f6965': fate.sh: add support for build-only FATE instances

Conflicts:

doc/fate.texi

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

(No files)