Zou Nan hai 6ef27b88e6 Merge branch '965-glsl' ...

Conflicts:

	src/mesa/drivers/dri/i965/brw_sf.h
	src/mesa/drivers/dri/i965/intel_context.c

2007-10-26 15:39:50 +08:00

..

beos

Ignore more generated files in progs/

2007-10-10 08:44:58 -06:00

demos

Ignore new programs

2007-10-25 11:34:16 -07:00

directfb

Ignore more generated files in progs/

2007-10-10 08:44:58 -06:00

egl

Ignore more generated files in progs/

2007-10-10 08:44:58 -06:00

fbdev

Ignore more generated files in progs/

2007-10-10 08:44:58 -06:00

fp

Ignore more generated files in progs/

2007-10-10 08:44:58 -06:00

ggi

GGI driver updates (Filip Spacek)

2002-06-10 15:16:44 +00:00

glsl

Merge branch '965-glsl'

2007-10-26 15:39:50 +08:00

images

new test image - Delicate Arch, Utah

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

miniglx

Ignore more generated files in progs/

2007-10-10 08:44:58 -06:00

osdemos

Ignore more generated files in progs/

2007-10-10 08:44:58 -06:00

redbook

add support for LDFLAGS env var

2007-09-28 18:42:21 -06:00

samples

Ignore more generated files in progs/

2007-10-10 08:44:58 -06:00

slang

Ignore more generated files in progs/

2007-10-10 08:44:58 -06:00

tests

Ignore more generated files in progs/

2007-10-10 08:44:58 -06:00

tools/trace

Ignore more generated files in progs/

2007-10-10 08:44:58 -06:00

trivial

Ignore more generated files in progs/

2007-10-10 08:44:58 -06:00

util

added a few more functions

2007-07-29 18:28:46 -06:00

vp

Ignore more generated files in progs/

2007-10-10 08:44:58 -06:00

windml

WindML updates (Stephane Raimbault)

2001-09-10 19:21:13 +00:00

xdemos

Ignore new programs

2007-10-25 11:34:16 -07:00

Makefile

Tweak the shell scripting for descending into and building subdirs.

2007-05-09 16:23:11 -06:00