gstreamer/libs
Sebastian Dröge 6b4091a30d Merge branch 'master' into 0.11
Conflicts:
	libs/gst/base/gstbaseparse.c
	libs/gst/base/gstbasetransform.c
	plugins/elements/gsttee.c
2012-03-08 10:19:52 +01:00
..
gst Merge branch 'master' into 0.11 2012-03-08 10:19:52 +01:00
Makefile.am android: make it ready for androgenizer 2011-04-11 01:08:07 +02:00