Changeset 0db04ca0 in ffmpeg

Timestamp:
Nov 2, 2013, 9:04:07 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
7146eacf
Parents:
b4f95c96 (diff), 056fd4fe (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/02/13 09:02:12)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/02/13 09:04:07)
Message:

Merge commit '056fd4fe65e70b4dbca97bcf7faf8b7ce3df993f'

Conflicts:

configure

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

(No files)

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