Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Jun 2013 11:45:39 +0000 (13:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Jun 2013 11:45:46 +0000 (13:45 +0200)
* qatar/master:
  configure: More msvc/icl combining

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

diff --cc configure
Simple merge