Tim-Philipp Müller 668e15598b Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
	sys/v4l2/gstv4l2object.c
2011-12-08 01:28:26 +00:00
..
2005-11-30 18:28:53 +00:00
2005-09-05 13:18:42 +00:00
2005-08-30 19:20:02 +00:00