Sebastian Dröge 9e13d70b2c Merge remote-tracking branch 'origin/0.10' ... Conflicts: gst-libs/gst/video/video-overlay-composition.c tests/check/libs/video.c		2012-03-29 15:00:22 +02:00
..
Makefile.am	playback-test: Link to libgstvideo too	2012-03-02 12:11:25 +01:00
playback-test.c	Merge remote-tracking branch 'origin/0.10'	2012-03-29 15:00:22 +02:00