Merge commit '4d3b144c5ea824193019019d33740a1ae9e0bb69'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Jan 2013 12:42:10 +0000 (13:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Jan 2013 12:42:10 +0000 (13:42 +0100)
commit841a288cb32785400261cbab959fcfb982d3f699
tree5cdac1ec2a527409495aadfb6d9142b89b398d8b
parenta6e4796fbf0aa9b13451a8ef917ecc4e80d1d272
parent4d3b144c5ea824193019019d33740a1ae9e0bb69
Merge commit '4d3b144c5ea824193019019d33740a1ae9e0bb69'

* commit '4d3b144c5ea824193019019d33740a1ae9e0bb69':
  fate: cosmetics: Order some test entries

Conflicts:
tests/fate/lossless-video.mak
tests/fate/microsoft.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests/fate/lossless-video.mak
tests/fate/microsoft.mak
tests/fate/seek.mak
tests/fate/utvideo.mak
tests/fate/vcodec.mak
tests/fate/video.mak
tests/fate/vpx.mak