Changeset 75f6ed8d in ffmpeg

Timestamp:

Feb 24, 2014, 9:29:24 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

774239be

Parents:

26dad980 (diff), c91488ab (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> (02/24/14 21:29:06)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/24/14 21:29:24)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: doc: fix one accented word

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

(No files)