Merge commit '4d1229dabf7a7e3b6a7b326afd79102256c3b008'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 01:22:33 +0000 (03:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 01:26:10 +0000 (03:26 +0200)
commit9e93e544dc2efa76bce51e59c2435414e38b0291
treebf0db49067ac90ee4d4bf6ac1d4dd1e8089dac9c
parent68939f7682de3e87251c6e08470d5779804ddd6d
parent4d1229dabf7a7e3b6a7b326afd79102256c3b008
Merge commit '4d1229dabf7a7e3b6a7b326afd79102256c3b008'

* commit '4d1229dabf7a7e3b6a7b326afd79102256c3b008':
  g2meet: Add FATE tests for all three G2M variants

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