Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Apr 2013 21:34:58 +0000 (23:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Apr 2013 21:34:58 +0000 (23:34 +0200)
commit8f116bf71b2349bc3a8de08ef25c2b74f972db26
tree81f892e1c2f6e34a65e8f64abf0ca7c963b0f70a
parente07e8882ae92b3328ca3ae97b494e5c2158256dd
parentbc7fbd36ea855339b6a12bf02a55b0bec7bba14f
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: cosmetics: More sensible order for entries in video filter file

Conflicts:
tests/fate/filter-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests/fate/filter-video.mak