Changeset 0129026c in ffmpeg

Timestamp:
Jul 22, 2013, 9:41:37 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
877bbe05
Parents:
9d4dece6 (diff), 41ef1d36 (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> (07/22/13 09:40:21)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (07/22/13 09:41:37)
Message:

Merge commit '41ef1d360bac65032aa32f6b43ae137666507ae5'

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

(No files)

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