gstreamer/libs
Edward Hervey 10e7159cf8 Merge branch 'master' into 0.11
Conflicts:
	gst/gstcaps.c
	gst/gstpad.c
	libs/gst/base/gstbasesink.c
	libs/gst/base/gstbasesink.h
	libs/gst/base/gstbasetransform.c
2011-09-23 13:09:25 +02:00
..
gst Merge branch 'master' into 0.11 2011-09-23 13:09:25 +02:00
Makefile.am android: make it ready for androgenizer 2011-04-11 01:08:07 +02:00