Changeset a8ddafb0 in ffmpeg

Timestamp:
Aug 28, 2013, 10:41:16 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
983ed20c
Parents:
72196a4b (diff), 4332bf98 (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> (08/28/13 10:40:47)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (08/28/13 10:41:16)
Message:

Merge commit '4332bf98dc051fd1ffbd9d4ddc1c5e55790c96f1'

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

(No files)

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