Wim Taymans e39182a085 Merge branch 'master' into 0.11 ... Conflicts: gst/gstminiobject.c gst/gstpad.c gst/gstpad.h gst/gstplugin.h libs/gst/base/gstbaseparse.c		2011-05-18 13:14:57 +02:00
..
gst	Merge branch 'master' into 0.11	2011-05-18 13:14:57 +02:00
Makefile.am	android: make it ready for androgenizer	2011-04-11 01:08:07 +02:00