Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Nov 2011 23:07:44 +0000 (00:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Nov 2011 23:07:51 +0000 (00:07 +0100)
* qatar/master:
  Enable w32threads automatically unless explicitly disabled

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

diff --cc configure
Simple merge