Changeset c0237d19 in ffmpeg

Timestamp:

Nov 24, 2013, 3:55:35 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

ceaaf0d9

Parents:

3d5a5e86 (diff), f187557a (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 'f187557ab4612776f7f527ecf3d40062975c3e4c'

• commit 'f187557ab4612776f7f527ecf3d40062975c3e4c': build: more fine-grained dependencies for documentation build tools

Conflicts:

configure
doc/Makefile

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

(No files)