gstreamer/libs/gst
Wim Taymans 6be4dbdb5a Merge branch 'master' into 0.11
Conflicts:
	android/base.mk
	android/controller.mk
	android/dataprotocol.mk
	android/elements.mk
	android/gst-inspect.mk
	android/gst-launch.mk
	android/gst-plugin-scanner.mk
	android/gst.mk
	android/indexers.mk
	android/net.mk
	win32/common/libgstbase.def
2011-04-11 10:26:54 +02:00
..
base Merge branch 'master' into 0.11 2011-04-11 10:26:54 +02:00
check buffer: more fixes 2011-03-28 20:08:47 +02:00
controller Merge branch 'master' into 0.11 2011-04-11 10:26:54 +02:00
dataprotocol Merge branch 'master' into 0.11 2011-04-11 10:26:54 +02:00
helpers android: make it ready for androgenizer 2011-04-11 01:08:07 +02:00
net Merge branch 'master' into 0.11 2011-04-11 10:26:54 +02:00
Makefile.am android: make it ready for androgenizer 2011-04-11 01:08:07 +02:00