Brian Paul 87a6fe57e8 Merge commit 'origin/gallium-0.1' into gallium-0.2 ...

Conflicts:

	progs/trivial/tri.c

2008-10-17 14:13:00 -06:00

..

beos

Merge branch 'gallium-0.1' into gallium-0.2

2008-09-11 16:05:15 +01:00

demos

mesa: revert accidental change to fslight.c demo

2008-10-15 10:54:57 -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-05-26 20:14:40 +09:00

glsl

replace 1.0/sqrt() with inversesqrt()

2008-10-10 12:04:49 -06:00

images

new test image - Delicate Arch, Utah

2006-05-10 22:44:26 +00:00

miniglx

Merge branch 'gallium-0.1' into gallium-0.2

2008-09-11 16:05:15 +01: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/gallium-0.1' into gallium-0.2

2008-09-21 12:22:21 -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-10-17 14:13:00 -06:00

util

Merge branch 'gallium-0.1' into gallium-0.2

2008-09-11 16:05:15 +01:00

vp

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

2008-10-15 17:20:30 +01:00

vpglsl

mesa: Update ignores a bit

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

windml

Remove CVS keywords.

2008-05-26 20:14:40 +09:00

xdemos

Merge commit 'origin/master' into gallium-0.2

2008-09-18 19:03:02 +01:00

Makefile

Never fail `make clean'

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