Brian Paul 5ac16495a2 Merge branch 'mesa_7_7_branch' ...

Conflicts:
	docs/relnotes.html
	src/gallium/drivers/llvmpipe/lp_tex_sample_c.c
	src/gallium/drivers/r300/r300_cs.h
	src/mesa/drivers/dri/i965/brw_wm_surface_state.c
	src/mesa/main/enums.c

2010-01-04 19:16:24 -07:00

..

beos

Remove CVS keywords.

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

demos

scons: Build progs together with everything else.

2010-01-01 12:16:19 +00:00

directfb

Ignore more generated files in progs/

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

egl

progs/egl: Silence uninitialized variable warnings.

2010-01-03 21:39:20 -08:00

fbdev

Merge branch 'gallium-0.1' into gallium-0.2

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

fp

scons: Build progs together with everything else.

2010-01-01 12:16:19 +00:00

ggi

Remove CVS keywords.

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

glsl

scons: Build progs together with everything else.

2010-01-01 12:16:19 +00: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

objviewer

progs: Ignore derived files.

2010-01-01 12:16:19 +00:00

openvg

progs: EGL/X progs should link to libX11.

2009-08-27 08:08:30 -06:00

osdemos

progs/osmes: add missing libGL dependency, remove unneeded lines

2009-12-21 13:37:11 -07:00

perf

scons: Build progs together with everything else.

2010-01-01 12:16:19 +00:00

rbug

Merge branch 'mesa_7_7_branch'

2010-01-04 19:16:24 -07:00

redbook

scons: Build progs together with everything else.

2010-01-01 12:16:19 +00:00

samples

Merge branch 'mesa_7_7_branch'

2010-01-04 19:16:24 -07:00

slang

progs/slang: Check for ftell failure in vstest.c.

2009-11-20 11:34:21 -08:00

tests

Merge branch 'mesa_7_7_branch'

2010-01-04 19:16:24 -07:00

tools/trace

fix gltrace (bug 16691)

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

trivial

scons: Build progs together with everything else.

2010-01-01 12:16:19 +00:00

util

Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

2009-12-27 15:31:08 -07:00

vp

Merge branch 'mesa_7_7_branch'

2010-01-04 19:16:24 -07:00

vpglsl

scons: Build progs together with everything else.

2010-01-01 12:16:19 +00:00

wgl

scons: Build progs together with everything else.

2010-01-01 12:16:19 +00:00

windml

Remove CVS keywords.

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

xdemos

Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

2009-12-21 18:23:53 -07:00

.gitignore

progs: Ignore Mac OS dSYM directories.

2009-12-02 15:22:34 -08:00

Makefile

Simplify hackery added to fix AIX build.

2009-12-01 10:27:27 -08:00

SConscript

scons: Build progs together with everything else.

2010-01-01 12:16:19 +00:00