Changeset 13aa5757 in ffmpeg

Timestamp:

Apr 7, 2014, 2:16:47 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a75ba1e1

Parents:

a6fa3a47 (diff), 486e3649 (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> (04/07/14 02:16:17)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/07/14 02:16:47)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: xtea: Add Doxy @file and group

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

(No files)