Merge commit '863ee06809b215895ee20cbc557eeceb904cf770'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 May 2015 23:20:24 +0000 (01:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 May 2015 23:20:24 +0000 (01:20 +0200)
commit02b5af7744059aecd580e5d7be60964695bd5a75
treecb3125f36485bc83116cf27571fcf69b8670df3e
parent0ba65c9f795a1d3ad842f6d3179472e35c73541c
parent863ee06809b215895ee20cbc557eeceb904cf770
Merge commit '863ee06809b215895ee20cbc557eeceb904cf770'

* commit '863ee06809b215895ee20cbc557eeceb904cf770':
  configure: Use the right local variable in the MSVC and ICL probes

Conflicts:
configure

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