Changeset 682b28b4 in ffmpeg

Timestamp:
Dec 17, 2013, 5:55:15 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
4e1dc60
Parents:
b22989da (diff), cfb4ee30 (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> (12/17/13 17:16:26)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (12/17/13 17:55:15)
Message:

Merge commit 'cfb4ee30977732674d30c20e93a761c33c743972'

Conflicts:

tests/fate/image.mak

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

(No files)

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