gstreamer/libs
Sebastian Dröge 753a1125dd Merge branch 'master' into 0.11
Conflicts:
	libs/gst/base/gstcollectpads2.c
	libs/gst/base/gstcollectpads2.h
2012-01-27 15:09:35 +01:00
..
gst Merge branch 'master' into 0.11 2012-01-27 15:09:35 +01:00
Makefile.am android: make it ready for androgenizer 2011-04-11 01:08:07 +02:00