gstreamer/libs
Tim-Philipp Müller eaa2d81474 Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
	gst/gstindexfactory.c
	libs/gst/base/gstbasetransform.c
	plugins/elements/gstfakesink.c
	plugins/elements/gstfakesrc.c
	plugins/elements/gstidentity.c
	plugins/elements/gstinputselector.c
	plugins/elements/gstoutputselector.c

Note: did not merge any of the basetransform changes from 0.10.
2011-12-08 00:39:10 +00:00
..
gst Merge remote-tracking branch 'origin/master' into 0.11 2011-12-08 00:39:10 +00:00
Makefile.am android: make it ready for androgenizer 2011-04-11 01:08:07 +02:00