Brian Paul 9b22427911 Merge branch 'mesa_7_7_branch' ...

Conflicts:

	src/mesa/drivers/dri/intel/intel_screen.c
	src/mesa/drivers/dri/intel/intel_swapbuffers.c
	src/mesa/drivers/dri/r300/r300_emit.c
	src/mesa/drivers/dri/r300/r300_ioctl.c
	src/mesa/drivers/dri/r300/r300_tex.c
	src/mesa/drivers/dri/r300/r300_texstate.c

2010-01-25 14:46:17 -07:00

..

beos

Remove CVS keywords.

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

demos

Merge branch 'mesa_7_7_branch'

2010-01-25 14:46:17 -07:00

directfb

Ignore more generated files in progs/

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

egl

Revert "add segl"

2010-01-23 10:33:03 +08:00

es1

progs/es2: Correctly set renderable type and client version.

2010-01-12 11:25:09 +08:00

es2

progs/es2: Correctly set renderable type and client version.

2010-01-12 11:25:09 +08:00

fbdev

Merge branch 'gallium-0.1' into gallium-0.2

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

fp

progs/fp: testcases for GL_ARB_fragment_coord_conventions

2010-01-21 09:38:50 -07:00

ggi

Remove CVS keywords.

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

glsl

Merge branch 'mesa_7_7_branch'

2010-01-14 22:31:04 +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: Check the number of configs returned by eglChooseConfig.

2010-01-12 10:55:35 +08: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

Merge branch 'mesa_7_7_branch'

2010-01-14 22:31:04 +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-14 22:31:04 +00:00

tools/trace

fix gltrace (bug 16691)

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

trivial

Merge branch 'arb_half_float_vertex'

2010-01-23 12:29:33 +10: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_7_branch'

2010-01-22 12:17:02 -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