Merge commit '604abd025dac4cc73a2f6b0c000c3695c16fb000'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Jun 2015 17:03:02 +0000 (19:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Jun 2015 17:03:02 +0000 (19:03 +0200)
commitf939bf58b22896fadfcfadaddb9c222a86e7ecfa
tree613e2244a3c4d710fe556cab5a4a4e074eb28caf
parentcec345625480482d99e7bc6c275979a336769488
parent604abd025dac4cc73a2f6b0c000c3695c16fb000
Merge commit '604abd025dac4cc73a2f6b0c000c3695c16fb000'

* commit '604abd025dac4cc73a2f6b0c000c3695c16fb000':
  configure: Provide an option to override the environment

Conflicts:
configure

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