Brian Paul b57abd3bea Merge branch 'mesa_7_6_branch' into mesa_7_7_branch ...

Conflicts:
	configure.ac
	progs/demos/morph3d.c
	progs/demos/textures.c
	progs/glsl/shtest.c
	progs/glsl/texaaline.c
	progs/tests/packedpixels.c
	progs/xdemos/corender.c
	src/mesa/main/version.h

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

..

beos

Remove CVS keywords.

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

demos

Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

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

directfb

Ignore more generated files in progs/

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

egl

progs/egl: Add support for pixmap and pbuffer surface to xeglgears.

2009-10-22 09:33:27 -06:00

fbdev

Merge branch 'gallium-0.1' into gallium-0.2

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

fp

Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

2009-12-07 17:16:10 -08:00

ggi

Remove CVS keywords.

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

glsl

Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

2009-12-21 18:23:53 -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

objviewer

objviewer: remove disabled code

2009-10-01 13:14:50 -06:00

openvg

progs: EGL/X progs should link to libX11.

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

osdemos

minor changes

2008-06-05 15:37:17 -06:00

perf

progs/perf: added check for GL_ARB_framebuffer_object

2009-12-21 13:49:25 -07:00

rbug

progs/rbug: Link to math

2009-09-26 12:36:01 -07:00

redbook

progs/redbook: Silence compiler warnings.

2009-12-21 15:20:01 -08:00

samples

progs/samples: Byte swap individual members of struct _rawImageRec.

2009-12-10 15:41:13 -08:00

slang

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

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

tests

Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

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

tools/trace

fix gltrace (bug 16691)

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

trivial

Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

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

util

Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

2009-12-11 09:22:00 -07:00

vp

progs/vp: Fix memory leak in vp-tris.c.

2009-12-03 23:20:18 -08:00

vpglsl

progs/vpglsl: Assign glGetUniformLocationARB return value to GLint.

2009-12-05 01:11:26 -08:00

wgl

progs/wgl: Fix shreadtex_mt too.

2009-06-17 15:23:25 +01: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

progs/perf: add scons support, get working under mingw

2009-09-17 12:08:04 +01:00

SConstruct

scons: Build the progs into seperate dirs as well.

2009-01-24 15:56:28 +00:00