Changeset 6742614c in ffmpeg

Timestamp:

Feb 17, 2014, 8:26:59 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c57fc97e

Parents:

f3bb5f28 (diff), 2f2b2efd (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 20:20:38)

git-committer:

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

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: doxygen: Replace @parblock syntax with manual linebreaks

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

(No files)