Michael Niedermayer 47ca9f041c Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  compat: wrap math.h to avoid AIX-specific clashes

Conflicts:
	configure

See: bf18abb2eb, 0915b531bc

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

2013-07-05 13:11:06 +02:00

..

math.h

Merge remote-tracking branch 'qatar/master'

2013-07-05 13:11:06 +02:00