Merge commit 'f5c43884190be094749acfba104e3eab98d8ff1e'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 13:41:49 +0000 (15:41 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 13:41:49 +0000 (15:41 +0200)
commitcd52ec2337ae0d78c53ed32602a100a67b829fe4
tree2fa58fae21216672317f25933ba8f3da0b8fc17a
parent7fe7cdca3665b8ab1863f8f79e6881c1c4d1b630
parentf5c43884190be094749acfba104e3eab98d8ff1e
Merge commit 'f5c43884190be094749acfba104e3eab98d8ff1e'

* commit 'f5c43884190be094749acfba104e3eab98d8ff1e':
  FATE: drop the audio stream from the dxtory test

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
tests/fate/screen.mak
tests/ref/fate/dxtory