Wim Taymans 016d036137 Merge branch 'master' into 0.11 ...

Conflicts:
	configure.ac
	gst-libs/gst/audio/gstbaseaudiosink.c
	gst/audioconvert/channelmixtest.c
	gst/playback/gstplaybasebin.c
	gst/playback/gstsubtitleoverlay.c
	tests/examples/Makefile.am
	tests/examples/audio/Makefile.am

2011-10-27 15:44:58 +02:00

..

ximage

Merge branch 'master' into 0.11

2011-10-27 15:44:58 +02:00

xvimage

Merge branch 'master' into 0.11

2011-10-27 15:44:58 +02:00

Makefile.am

Remove v4l plugin

2011-06-07 20:47:46 +01:00