Tim-Philipp Müller 81ce8b76d0 Merge remote-tracking branch 'origin/master' into 0.11 ... Conflicts: plugins/elements/gstfilesrc.c		2011-12-25 12:47:55 +00:00
..
elements	Merge remote-tracking branch 'origin/master' into 0.11	2011-12-25 12:47:55 +00: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