Merge commit '991362fab49b60d34d89b7b7d6dd00fbec3ce022'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Mar 2014 04:49:22 +0000 (05:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Mar 2014 04:50:38 +0000 (05:50 +0100)
commit2b570c9569a2c8858f5f5f198efcf7000cfc4738
tree53e1dabbb3eb3793278b956bb95a687e7d40bd81
parent1da186676738dbded75a83d72f0739b993970d4e
parent991362fab49b60d34d89b7b7d6dd00fbec3ce022
Merge commit '991362fab49b60d34d89b7b7d6dd00fbec3ce022'

* commit '991362fab49b60d34d89b7b7d6dd00fbec3ce022':
  fate: add XBM tests

Conflicts:
tests/fate/image.mak

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