Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Oct 2012 12:13:51 +0000 (14:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Oct 2012 12:13:51 +0000 (14:13 +0200)
commitc6d39fb3c5a763c2cfba34154e0f8ba52f02a96e
tree2c2e94db251ff485d92f4ee81396342265132b9b
parentcd6f5c4895c49b483542030324ea5198521ab28b
parent4b895cb294d610fb3bf9e57385e665488e8a9ffa
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: sanitize linking of tools and test programs
  fate: Refactor setting of environment variables for groups of tests

Conflicts:
tests/fate/audio.mak
tests/fate/real.mak
tests/fate/voice.mak

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