Wim Taymans 238b9a57cc Merge branch 'master' into 0.11 ... Conflicts: configure.ac gst/gstelement.c gst/gstelement.h gst/gstpad.c gst/gstutils.c libs/gst/base/Makefile.am libs/gst/check/Makefile.am libs/gst/controller/Makefile.am libs/gst/dataprotocol/Makefile.am libs/gst/net/Makefile.am win32/common/libgstreamer.def		2011-02-22 14:11:59 +01:00
..
gst	Merge branch 'master' into 0.11	2011-02-22 14:11:59 +01:00
Makefile.am	removing last mentions of wingo cothreads	2003-12-24 15:11:20 +00:00