Tim-Philipp Müller ec0d3566bf Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
	ext/alsa/gstalsasrc.c
	ext/alsa/gstalsasrc.h
	gst/adder/gstadder.c
	gst/playback/gstplaybin2.c
	gst/playback/gstplaysinkconvertbin.c
	win32/common/libgstvideo.def
2011-12-02 00:07:39 +00:00
..
2011-07-27 01:18:19 +01:00
2011-11-08 11:08:21 +01:00
2011-03-28 15:51:46 +02:00
2011-11-08 11:08:21 +01:00
2011-11-08 11:08:21 +01:00