Tim-Philipp Müller a1daf846f3 Merge remote-tracking branch 'origin/master' into 0.11 ... Conflicts: gst/gstobject.h libs/gst/check/gstcheck.h libs/gst/controller/gstcontroller.c plugins/elements/gstidentity.c tools/gst-xmlinspect.c		2011-12-04 15:38:09 +00:00
..
gst	Merge remote-tracking branch 'origin/master' into 0.11	2011-12-04 15:38:09 +00:00
Makefile.am	android: make it ready for androgenizer	2011-04-11 01:08:07 +02:00