gstreamer/libs
Wim Taymans 5cf8e68944 Merge branch 'master' into 0.11
Conflicts:
	gst/gstmessage.c
	gst/gstquery.c
	gst/gstregistrychunks.c
	gst/gstsegment.c
	libs/gst/base/gstbasetransform.c
	libs/gst/base/gstbasetransform.h
	libs/gst/base/gsttypefindhelper.c
	plugins/elements/gsttypefindelement.c
2011-08-26 14:37:54 +02:00
..
gst 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