Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 14:00:49 +0000 (15:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 14:00:53 +0000 (15:00 +0100)
commitf385a099c1999b9d9583324b2a3bb2b6bc98b4a1
tree4356c93009f6d46fb453e19b9ce184f52e89f088
parentbb6de15d927dcbc5175387fdbb2c066243c1c6b4
parentaac9e56759350e5466afb025c434c435c9ebb125
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix hardware detection on aix.

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