Merge commit 'acbe15a99f158dbb0edb837fb6557171dc4376d4'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Mar 2015 21:20:15 +0000 (22:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Mar 2015 21:20:15 +0000 (22:20 +0100)
commit96bd0321936bc8e0c4610a906832ef0b80061d06
tree32ab12b990a26bdcd5d34a63f34db1e961a4e4c1
parent209001073adf190ccf2e578f25d4b3d41b1640a0
parentacbe15a99f158dbb0edb837fb6557171dc4376d4
Merge commit 'acbe15a99f158dbb0edb837fb6557171dc4376d4'

* commit 'acbe15a99f158dbb0edb837fb6557171dc4376d4':
  fate: Add test for DCA XLL

Conflicts:
tests/fate/audio.mak

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