gstreamer/libs
Wim Taymans 92aa4fede9 Merge branch 'master' into 0.11
Conflicts:
	libs/gst/base/gstbaseparse.c
	libs/gst/base/gstbasesink.c
2011-07-21 16:49:13 +02:00
..
gst Merge branch 'master' into 0.11 2011-07-21 16:49:13 +02:00
Makefile.am android: make it ready for androgenizer 2011-04-11 01:08:07 +02:00