Wim Taymans 01b9b5002f Merge branch 'master' into 0.11 ...

Conflicts:
	common
	configure.ac
	gst/colorspace/colorspace.c
	gst/colorspace/colorspace.h
	gst/colorspace/gstcolorspace.c

2011-08-04 09:36:07 +02:00

..

.gitignore

ex/: #define red green

2006-06-12 11:30:08 +00:00

dfb-example.c

directfb: don't put code with side-effects into g_assert()

2011-01-08 00:01:01 +00:00

dfbvideosink.c

Merge branch 'master' into 0.11

2011-08-04 09:36:07 +02:00

dfbvideosink.h

meta: fix for new metadata api

2011-02-28 12:06:57 +01:00

Makefile.am

Remove setting of plugindir from Makefiles

2011-04-01 13:54:02 -07:00