Changeset c97c7c2a in ffmpeg

Timestamp:

Feb 17, 2014, 1:47:20 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a707d18a

Parents:

1fc74926 (diff), f53e274f (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/17/14 01:46:57)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/17/14 01:47:20)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: doc: Fix project name typo

Merge for metadata only

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

(No files)