Merge commit '0e29c5e1285eeb5b4842d96d00dfe06898cd87e5'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 20:23:42 +0000 (21:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 20:23:42 +0000 (21:23 +0100)
commit981aa023387ebfaa19ea8079e423d72cd0321b0b
treeea594083e20d54b223c44b0a3b9e50d701b49ac2
parent2631d155baa5bf9e335925d44fcfd276c6d3719f
parent0e29c5e1285eeb5b4842d96d00dfe06898cd87e5
Merge commit '0e29c5e1285eeb5b4842d96d00dfe06898cd87e5'

* commit '0e29c5e1285eeb5b4842d96d00dfe06898cd87e5':
  build: Drop stray LPC dependency on dsputil

Conflicts:
configure

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