gstreamer/libs
Wim Taymans a12ede3fb1 Merge branch 'master' into 0.11-fdo
Conflicts:
	gst/gst.c
	libs/gst/base/gstcollectpads.c
2011-03-28 20:11:20 +02:00
..
gst Merge branch 'master' into 0.11-fdo 2011-03-28 20:11:20 +02:00
Makefile.am removing last mentions of wingo cothreads 2003-12-24 15:11:20 +00:00