Changeset 29c83d23 in ffmpeg

Timestamp:
Nov 16, 2013, 11:01:23 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
cc4a6435
Parents:
0ee905e2 (diff), b9fb59d2 (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> (11/16/13 23:00:55)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/16/13 23:01:23)
Message:

Merge commit 'b9fb59d2ab05fdfe89d3fb0d7ecbbd91e560f57d'

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

(No files)

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