Changeset 2b570c95 in ffmpeg

Timestamp:
Mar 28, 2014, 4:50:38 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
a696b091
Parents:
1da18667 (diff), 991362fa (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> (03/28/14 04:49:22)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/28/14 04:50:38)
Message:

Merge commit '991362fab49b60d34d89b7b7d6dd00fbec3ce022'

Conflicts:

tests/fate/image.mak

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

(No files)

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