gstreamer/libs/gst/dataprotocol
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
..
.gitignore Update a bunch of gitignores to clean up my git status output 2009-01-23 16:08:40 +00:00
dataprotocol.c libs: remove deprecated code 2010-12-06 19:40:03 +01:00
dataprotocol.h libs: remove deprecated code 2010-12-06 19:40:03 +01:00
dp-private.h Make code safe for -Wredundant-decls 2010-03-10 20:45:33 +01:00
Makefile.am Merge branch 'master' into 0.11 2011-02-22 14:11:59 +01:00