Changeset 835f4137 in ffmpeg

Timestamp:

Mar 12, 2014, 10:02:56 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

675a66a9

Parents:

e5920425 (diff), d15c5361 (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 'd15c536123a44362ace6299c391a492c90b83fc7'

• commit 'd15c536123a44362ace6299c391a492c90b83fc7': doc: Point to the correct, actually maintained gas-preprocessor repo

Conflicts:

doc/platform.texi

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

(No files)