Brian Paul 1fa7789e82 Merge branch '7.8' ...

Conflicts:

	src/glx/dri2_glx.c
	src/glx/glx_pbuffer.c

2010-04-28 07:21:25 -06:00

..

beos

Remove CVS keywords.

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

demos

Merge branch '7.8'

2010-04-22 11:10:19 -06:00

egl

progs/egl: Add egl/eglut to PROGRAM_DIRS.

2010-04-27 14:19:24 +08:00

fbdev

Merge branch 'gallium-0.1' into gallium-0.2

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

fp

Fix up more stale references to gl(X)_API.xml which have moved.

2010-02-26 10:48:07 +01:00

fpglsl

progs/fpglsl: Fix GLSL compilation failures on Mac OS X.

2010-03-11 00:10:26 -08:00

glsl

progs/glsl: better comments

2010-04-21 16:30:13 -06:00

images

new test image - Delicate Arch, Utah

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

objviewer

progs/objviewer: remove debug code

2010-03-15 11:31:59 -06:00

osdemos

osdemos: replace assertion with error handler

2010-04-27 17:05:56 -06:00

perf

scons: Build progs together with everything else.

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

rbug

rbug: Rename pipe formats.

2010-03-02 10:21:55 +00:00

redbook

Add programs to .gitignore in redbook

2010-03-12 08:57:34 -07:00

samples

progs/samples: improve copy.c demo

2010-03-17 10:17:06 -06:00

slang

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

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

tests

progs/tests: Remove meaningless const qualifier in arraytexture.c.

2010-04-27 01:22:26 -07:00

tools/trace

Fix up more stale references to gl(X)_API.xml which have moved.

2010-02-26 10:48:07 +01:00

trivial

progs/trivial: Update .gitignore.

2010-04-11 17:30:44 -07: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

xdemos

Change libX11 variables to not conflict with AC_PATH_XTRA

2010-04-19 20:21:57 -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/gallium: Move into src/gallium/tests

2010-04-13 07:05:46 +09:00