Changeset 95ad2483 in ffmpeg

Timestamp:
Dec 11, 2013, 9:52:28 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
1dbb3cfa
Parents:
37437d97 (diff), 3bb91a1b (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> (12/11/13 21:51:44)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (12/11/13 21:52:28)
Message:

Merge commit '3bb91a1b5c4a0c5ec9c4d3b6649b23285c3d7f26'

Conflicts:

configure

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

(No files)

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