Michael Niedermayer ae3d2afd46 Merge commit '6289706b35d1b030258bba54cc27bb6d2c04bc9b'
* commit '6289706b35d1b030258bba54cc27bb6d2c04bc9b':
  fate: Move tdsc to the appropriate screen capture file

Conflicts:
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-17 21:58:16 +01:00
..
2014-11-28 17:55:27 -05:00
2015-02-01 22:38:11 +01:00