Brian Paul 19e4222f93 Merge commit 'origin/master' into gallium-0.2 ...

Conflicts:

	src/mesa/shader/prog_execute.c
	src/mesa/shader/slang/library/slang_vertex_builtin_gc.h

2008-11-11 14:42:41 -07:00

..

beos

Remove CVS keywords.

2008-09-21 11:00:44 -07:00

demos

mesa: more test options in progs/demos/textures.c

2008-10-20 17:43:05 -06:00

directfb

Ignore more generated files in progs/

2008-05-20 19:04:57 -04:00

egl

link EGL demos with -lGL

2008-09-26 11:20:20 +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

Merge commit 'origin/master' into gallium-0.2

2008-11-11 14:42:41 -07: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

2008-11-11 14:42:41 -07:00

tools/trace

fix gltrace (bug 16691)

2008-07-14 08:50:36 -06:00

trivial

CELL: stencil bug fixes

2008-10-30 15:24:52 -06:00

util

Merge commit 'origin/master' into gallium-0.2

2008-11-05 11:59:12 +00:00

vp

move glut.h include

2008-10-28 19:01:38 -06:00

vpglsl

mesa: Update ignores a bit

2008-09-19 12:43:47 +02:00

windml

Remove CVS keywords.

2008-09-21 11:00:44 -07:00

xdemos

Merge commit 'origin/master' into gallium-0.2

2008-10-27 15:37:22 +00:00

Makefile

Never fail `make clean'

2008-05-07 11:35:23 -07:00