gstreamer/libs/gst
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
..
base Merge branch 'master' into 0.11 2011-02-22 14:11:59 +01:00
check Merge branch 'master' into 0.11 2011-02-22 14:11:59 +01:00
controller Merge branch 'master' into 0.11 2011-02-22 14:11:59 +01:00
dataprotocol Merge branch 'master' into 0.11 2011-02-22 14:11:59 +01:00
helpers build: when building executables, put libs to link to into LDADD instead of LDFLAGS 2010-04-14 11:23:37 +01:00
net Merge branch 'master' into 0.11 2011-02-22 14:11:59 +01:00
Makefile.am registry: Add registry helper phase 1 2009-10-06 19:51:42 +01:00