Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Nov 2014 11:26:50 +0000 (12:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Nov 2014 11:26:55 +0000 (12:26 +0100)
commitb0ed88b4c0e9c98881e2db77b697e352fd78e7b4
tree5a9b065d713b191897301002347f57141f1babfa
parent9ebfe38f3873eafacff9b0933cbf9b97198ec020
parent4436a8f44dedc83767b3d9da9beb85d1fae2ca30
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Remove fminf() emulation.

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