Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 4 Dec 2014 00:47:46 +0000 (01:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 4 Dec 2014 00:52:01 +0000 (01:52 +0100)
commit8d87c0b3ad76796a359a297b14ef62de88457fdf
tree3f39ab906218f9ae3c20ec0df4a44081961ae19e
parent0f16ab18db807194357f9f907340640aa1fe7c85
parent963aa1daf88066d43c7495803b870800c5faaa4d
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix standalone compilation of the iec61883 input device.

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