gstreamer/plugins
Tim-Philipp Müller f6a4af20b2 Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
	libs/gst/base/gstbasetransform.c
	libs/gst/controller/gstinterpolationcontrolsource.c
	libs/gst/controller/gstlfocontrolsource.c
	plugins/elements/gstfilesrc.c

Dit not merge controller or basetransform changes.
2011-12-25 11:58:12 +00:00
..
elements Merge remote-tracking branch 'origin/master' into 0.11 2011-12-25 11:58:12 +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