Changeset 2320731 in ffmpeg

Timestamp:
May 28, 2014, 12:44:55 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
175aeab0
Parents:
61917a10 (diff), 593886b5 (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> (05/28/14 12:44:26)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/28/14 12:44:55)
Message:

Merge commit '593886b5dd2b583657aa3fd80bb173f702c9710d'

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

(No files)

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