Changeset a8fe8d4f in ffmpeg

Timestamp:

Oct 29, 2013, 8:50:49 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0999b1db

Parents:

0460b9b (diff), 9510d768 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (10/29/13 20:45:18)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/29/13 20:50:49)

Message:

Merge commit '9510d7689e236f6a4748795604fba427c130d0ad'

• commit '9510d7689e236f6a4748795604fba427c130d0ad': fate.sh: Allow non-fast-forwards when updating sources

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

(No files)