Sebastian Dröge 68c0790817 Merge branch 'master' into 0.11
Conflicts:
	gst-libs/gst/interfaces/propertyprobe.c
	sys/xvimage/xvimagesink.c
2012-01-25 11:50:54 +01:00
..
2012-01-19 11:36:17 +01:00
2011-05-23 15:02:27 +03:00
2012-01-18 16:21:14 +01:00
2012-01-25 11:50:54 +01:00
2011-11-28 13:09:02 +00:00
2012-01-19 11:36:17 +01:00