Changeset 71052d8 in ffmpeg

Timestamp:

Feb 14, 2014, 2:23:29 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

fba1592f

Parents:

cbf09bb6 (diff), 3a26ccb (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.

Message:

Merge commit '3a26ccbf0d9f806d067e76a3f484170abecb36b3'

• commit '3a26ccbf0d9f806d067e76a3f484170abecb36b3': build: doxy: Include code examples in Doxygen documentation

Conflicts:

doc/Makefile

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

(No files)