Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Feb 2013 12:13:03 +0000 (13:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Feb 2013 12:13:10 +0000 (13:13 +0100)
* qatar/master:
  configure: icc: Drop nonsense adding of cpuflags to LDFLAGS

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

diff --cc configure
Simple merge