Edward Hervey df6044f7eb Merging origin/master ... Conflicts: gst/gstbin.c gst/gstbus.c gst/gstdebugutils.c gst/gstpad.c libs/gst/base/gstbaseparse.c libs/gst/base/gstbasesrc.c		2011-10-21 10:52:46 +02:00
..
base	Merging origin/master	2011-10-21 10:52:46 +02:00
check	gstcheck: Make ASSERT_MINI_OBJECT_REFCOUNT more useful	2011-10-17 09:51:15 +02:00
controller	controller: Add g-i annotations and remove "Since:" markers	2011-10-18 13:54:52 +02:00
dataprotocol	buffer: rename PREROLL -> LIVE flag	2011-08-16 17:32:20 +02:00
helpers	android: make it ready for androgenizer	2011-04-11 01:08:07 +02:00
net	gst: make compiler warn about unstable API if GST_USE_UNSTABLE_API is not defined	2011-07-05 09:46:43 +01:00
Makefile.am	android: make it ready for androgenizer	2011-04-11 01:08:07 +02:00