Changeset 2fd0b5bd in ffmpeg

Timestamp:

Feb 14, 2014, 1:53:54 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

cbf09bb6

Parents:

c0c6f9ab (diff), f1f42cfc (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/14/14 13:52:50)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/14/14 13:53:54)

Message:

Merge commit 'f1f42cfc66804907d1df9231469e4296472bb0f5'

• commit 'f1f42cfc66804907d1df9231469e4296472bb0f5': build: Do not pass HTML snippets and stylesheet as input to Doxygen

Conflicts:

doc/Makefile

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

(No files)