Changeset aa175983 in ffmpeg

Timestamp:

Mar 12, 2014, 8:05:00 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

990f956c

Parents:

7e6c6c45 (diff), b3c6ee19 (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 'b3c6ee199e75bbad2908253f11e871500dd38531'

• commit 'b3c6ee199e75bbad2908253f11e871500dd38531': configure: Group toolchain options together in help output

Conflicts:

configure

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

(No files)