Merge commit '5800ba0db667630e6ff81d30f03961ea10726aa6'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Feb 2014 21:25:08 +0000 (22:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Feb 2014 21:25:13 +0000 (22:25 +0100)
commit38336f0fb10a0a1dbcbbf371d0ab90520cee29c0
tree6929e67a5068d4333aa971af67511bb5852e6a07
parent96ea3dea5805404e929d9d8611acb431792df6cf
parent5800ba0db667630e6ff81d30f03961ea10726aa6
Merge commit '5800ba0db667630e6ff81d30f03961ea10726aa6'

* commit '5800ba0db667630e6ff81d30f03961ea10726aa6':
  configure: disable cpunop if the check fails

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