Changeset 875f9aea in ffmpeg

Timestamp:

Nov 27, 2013, 1:09:16 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

5b326f39

Parents:

6d9dad6a (diff), dc80e2f7 (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> (11/27/13 00:52:55)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/27/13 01:09:16)

Message:

Merge commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c'

• commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c': Makefile: Fix building programs on systems with a nonempty executable suffix

Conflicts:

Makefile

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

(No files)