gstreamer/libs
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
..
gst Merging origin/master 2011-10-21 10:52:46 +02:00
Makefile.am android: make it ready for androgenizer 2011-04-11 01:08:07 +02:00