Merge commit 'b3c6ee199e75bbad2908253f11e871500dd38531'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 20:05:00 +0000 (21:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 20:05:00 +0000 (21:05 +0100)
commitaa175983a1968f9c390379e0c735910b5e32ac0d
tree11b28f6087d4fdea47ee8811c7efa861414eb7b3
parent7e6c6c45ec7c27b90b4b9d89d9f4b3f19bf30cb0
parentb3c6ee199e75bbad2908253f11e871500dd38531
Merge commit 'b3c6ee199e75bbad2908253f11e871500dd38531'

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

Conflicts:
configure

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