Merge commit 'ce52869c22738ad584995d48103ce3aa2301736b'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 20:59:34 +0000 (21:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 20:59:34 +0000 (21:59 +0100)
commit8f140a8ec3b8be57892be7103998da3321e4aeb8
tree4865bb7315d6fff6dd9bf8687ad67d62fa43ba1e
parent9ad8f55edaf20a73ebf42ad9f0398e96a1726690
parentce52869c22738ad584995d48103ce3aa2301736b
Merge commit 'ce52869c22738ad584995d48103ce3aa2301736b'

* commit 'ce52869c22738ad584995d48103ce3aa2301736b':
  fate: Rename fate-dts test to fate-dca-core

Conflicts:
tests/fate/audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests/fate/audio.mak