Changeset 9c29967a in ffmpeg

Timestamp:

Jan 2, 2014, 1:02:21 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0f378d86

Parents:

0aa3254 (diff), 58f0d164 (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> (01/02/14 00:53:31)

git-committer:

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

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: Makefile: add html template files to the doxygen deps

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

(No files)