Changeset 606a30c5 in ffmpeg

Timestamp:
Aug 22, 2013, 11:58:23 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
25e4ec6a
Parents:
d68adbd6 (diff), fe5d5a8 (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/22/13 11:42:47)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (08/22/13 11:58:23)
Message:

Merge commit 'fe5d5a8ffcafdc14c0d26eaea6464c89e120cc9e'

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

(No files)

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