Alan Hourihane 4df482086e Merge commit 'origin/master' into gallium-0.2 ... Conflicts: windows/VC8/mesa/osmesa/osmesa.vcproj windows/VC8/progs/demos/gears.vcproj windows/VC8/progs/progs.sln		2009-01-22 09:43:42 +00:00
..
beos	Remove CVS keywords.	2008-09-21 11:00:44 -07:00
demos	demos: all glutDestroyWindow() upon exit to test query object clean-up	2008-12-18 14:17:06 -07:00
directfb	Ignore more generated files in progs/	2008-05-20 19:04:57 -04:00
egl	egl: eglinfo load i915 driver	2009-01-19 02:29:54 +01:00
fbdev	Merge branch 'gallium-0.1' into gallium-0.2	2008-09-11 16:05:15 +01:00
fp	Merge commit 'origin/gallium-0.1' into gallium-0.2	2008-09-21 12:22:21 -07:00
ggi	Remove CVS keywords.	2008-09-21 11:00:44 -07:00
glsl	progs: Ignores	2009-01-21 15:01:13 +01:00
images	new test image - Delicate Arch, Utah	2006-05-10 22:44:26 +00:00
miniglx	Remove CVS keywords.	2008-09-21 11:00:44 -07:00
osdemos	minor changes	2008-06-05 15:37:17 -06:00
redbook	Merge commit 'origin/gallium-0.1' into gallium-0.2	2008-09-11 18:32:05 +01:00
samples	Merge commit 'origin/gallium-0.1' into gallium-0.2	2008-09-11 18:32:05 +01:00
slang	Merge branch 'gallium-0.1' into gallium-0.2	2008-09-11 16:05:15 +01:00
tests	Merge commit 'origin/master' into gallium-0.2	2009-01-22 09:43:42 +00:00
tools/trace	fix gltrace (bug 16691)	2008-07-14 08:50:36 -06:00
trivial	Merge commit 'origin/gallium-0.2' into gallium-xlib-rework	2009-01-19 10:15:04 +00:00
util	util: check for frag/vertShader=0 before attaching	2008-12-18 14:17:06 -07:00
vp	move glut.h include	2008-10-28 19:01:38 -06:00
vpglsl	mesa: fix build	2008-11-14 14:30:49 +00:00
windml	Remove CVS keywords.	2008-09-21 11:00:44 -07:00
xdemos	Merge commit 'origin/master' into gallium-0.2	2008-11-15 16:53:24 +00:00
Makefile	Never fail `make clean'	2008-05-07 11:35:23 -07:00
SConscript	scons: Build progs.	2008-12-12 12:37:21 +09:00
SConstruct	scons: Build progs.	2008-12-12 12:37:21 +09:00