gstreamer/libs
Tim-Philipp Müller e09fe53a22 Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
	common
	gst/gstpad.h
	gst/gsttask.c
	libs/gst/base/gstcollectpads2.h
2012-03-08 19:55:30 +00:00
..
gst Merge remote-tracking branch 'origin/master' into 0.11 2012-03-08 19:55:30 +00:00
Makefile.am android: make it ready for androgenizer 2011-04-11 01:08:07 +02:00