Wim Taymans 4007076b55 Merge branch 'master' into 0.11 ... Conflicts: ext/theora/gsttheoraenc.c		2011-04-06 16:33:56 +02:00
..
v4l	plugins: fix for new memory API	2011-03-27 17:16:10 +02:00
ximage	ximage: more fixes	2011-04-06 16:26:12 +02:00
xvimage	Merge branch 'master' into 0.11	2011-04-06 16:33:56 +02:00
Makefile.am	build: build plugin and example directories in parallel if make -jN is used	2010-03-29 00:26:59 +01:00