Merge commit '54a6e08a650a71fd375551585b0ea40a3a06d228'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Mar 2014 21:12:06 +0000 (22:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Mar 2014 21:12:11 +0000 (22:12 +0100)
commit3775224b2f8a9c2c0bf5d53272236d4a1ffb0875
tree2125e454ac53d8e5e01f3b70e28206308e8a2197
parentba85bfabf3a1b762b3e07f53d404f4c7c4e1703a
parent54a6e08a650a71fd375551585b0ea40a3a06d228
Merge commit '54a6e08a650a71fd375551585b0ea40a3a06d228'

* commit '54a6e08a650a71fd375551585b0ea40a3a06d228':
  dsputil: Conditionally compile dsputil code on all architectures

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