Changeset 7146eacf in ffmpeg

Timestamp:
Nov 2, 2013, 9:13:14 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
0b82fdcc
Parents:
0db04ca0 (diff), 1700b4e6 (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> (11/02/13 09:11:35)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/02/13 09:13:14)
Message:

Merge commit '1700b4e678ed329611a16b20d11e64b7abda4839'

Conflicts:

libavcodec/x86/Makefile

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

(No files)

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