Changeset bc6e535d in ffmpeg

Timestamp:
Aug 28, 2013, 10:57:09 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
48480da6
Parents:
983ed20c (diff), 0ce1a759 (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:57:05)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (08/28/13 10:57:09)
Message:

Merge commit '0ce1a7598e84abe6fb3684d0d5b0872d36f001d7'

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

(No files)

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