Merge commit 'f9900822fc5f0b0c7242ca318290c090bd5d0af0'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jul 2014 20:11:37 +0000 (22:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jul 2014 20:12:16 +0000 (22:12 +0200)
commita65d6e17bd04e11b863c8f80d028af0058440a68
tree4b8043851c2c1c6b55b5b2f7c54066559d15fe94
parent8bbadc9b6ec71abbd9dab854c47027b949997af0
parentf9900822fc5f0b0c7242ca318290c090bd5d0af0
Merge commit 'f9900822fc5f0b0c7242ca318290c090bd5d0af0'

* commit 'f9900822fc5f0b0c7242ca318290c090bd5d0af0':
  fate: Use the correct, local path to samples for opus reference files

Conflicts:
tests/fate/opus.mak

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