Wim Taymans 8170c34c94 Merge branch 'master' into 0.11 ... Conflicts: gst/gstbuffer.h gst/gstcaps.c gst/gstcaps.h gst/gstevent.c		2011-08-22 12:33:35 +02:00
..
gst	Merge branch 'master' into 0.11	2011-08-22 12:33:35 +02:00
Makefile.am	android: make it ready for androgenizer	2011-04-11 01:08:07 +02:00