Changeset 532ca123 in ffmpeg

Timestamp:

Oct 31, 2013, 12:35:55 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

045214e3

Parents:

fa6fa216 (diff), c7f25d4c (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> (10/31/13 12:08:06)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/31/13 12:35:55)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: build: Ensure that strip commands are run silently

Conflicts:

Makefile

Not merged as it conflicts with strip being on the BRIEF list

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

(No files)