Christian König d2ff6b8715 Merge remote branch 'origin/master' into pipe-video ... Conflicts: src/gallium/drivers/r600/r600_asm.c src/gallium/drivers/r600/r600_shader.c		2011-01-20 22:10:37 +01:00
..
egl	egl: Fix EGL_VERSION string.	2011-01-14 14:29:19 +08:00
gallium	Merge remote branch 'origin/master' into pipe-video	2011-01-20 22:10:37 +01:00
getopt	getopt: Make code more portable.	2011-01-12 16:54:21 +00:00
glsl	Merge branch 'draw-instanced'	2011-01-15 10:24:08 -07:00
glu	mesa: fix mesa version string construction	2010-10-19 08:59:27 -06:00
glut	scons: Revamp how to specify targets to build.	2010-11-01 13:30:22 +00:00
glw	Makefiles: Don't complain if depend file to be included doesn't exist.	2010-07-21 13:19:33 -07:00
glx	glapi: regenerated files	2011-01-15 17:37:41 -07:00
mapi	glapi: regenerated files	2011-01-15 18:35:45 -07:00
mesa	mesa: minor tweaks in _mesa_set_fetch_functions()	2011-01-15 20:41:26 -07:00
talloc	scons: Fix inverted logic.	2010-08-26 18:29:04 +01:00
Makefile
SConscript	scons: Fix cross-compilation.	2011-01-13 20:53:42 +00:00