Merge commit 'a31c4b2cbef9aee15910fc3df52519aef46760de'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 22:34:24 +0000 (00:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 22:34:24 +0000 (00:34 +0200)
commit03b2b40fd7f010fc245d36c05c7439c058b927bf
tree7b50d24beddf2544c6f51a0a078950a7673565c0
parent838c5f3df7e98b15fd3acbcacaf315c32600ca45
parenta31c4b2cbef9aee15910fc3df52519aef46760de
Merge commit 'a31c4b2cbef9aee15910fc3df52519aef46760de'

* commit 'a31c4b2cbef9aee15910fc3df52519aef46760de':
  fate-g2m3: disable the audio stream

Conflicts:
tests/ref/fate/g2m3

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