Sebastian Dröge 1fa356a23c Merge branch 'master' into 0.11 ... Conflicts: gst/gstpad.c libs/gst/base/gstbaseparse.c		2011-11-24 11:23:07 +01:00
..
elements	Merge branch 'master' into 0.11	2011-11-24 11:23:07 +01:00
indexers	Merge branch 'master' into 0.11	2011-08-26 14:37:54 +02:00
Makefile.am	android: make it ready for androgenizer	2011-04-11 01:08:07 +02:00