Sebastian Dröge 99a8cd1048 Merge branch 'master' into 0.11 ... Conflicts: libs/gst/base/gstcollectpads2.c libs/gst/check/gstconsistencychecker.c		2012-03-01 14:43:01 +01:00
..
gst	Merge branch 'master' into 0.11	2012-03-01 14:43:01 +01:00
Makefile.am	android: make it ready for androgenizer	2011-04-11 01:08:07 +02:00