Wim Taymans 6f295dc239 Merge branch 'master' into 0.11 ... Conflicts: gst/gstobject.c		2011-08-24 10:43:09 +02:00
..
gst	Merge branch 'master' into 0.11	2011-08-24 10:43:09 +02:00
Makefile.am	android: make it ready for androgenizer	2011-04-11 01:08:07 +02:00