Brian Paul 0815ebccfc Merge commit 'origin/master' into gallium-0.2 ...

Conflicts:

	src/mesa/main/ffvertex_prog.c
	src/mesa/main/texenvprogram.c

2009-01-02 16:32:26 -07: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

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

2009-01-02 16:32:26 -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-12-16 15:50:14 -07:00

tools/trace

fix gltrace (bug 16691)

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

trivial

Merge commit 'origin/gallium-0.1' into gallium-0.2

2008-12-22 19:31:52 +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