Brian Paul 182c42c8da Merge branch '7.8' ...

Conflicts:

	src/gallium/drivers/cell/ppu/cell_screen.c
	src/mesa/state_tracker/st_cb_drawpixels.c

2010-03-22 09:07:46 -06:00

..

beos

Remove CVS keywords.

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

demos

progs/demos: added 'f' key to toggle filtering mode in stex3d.c

2010-03-11 14:49:01 -07:00

egl

Use X_LIBS from pkg-config, instead of libdir, for locating libX11

2010-03-13 11:42:24 -08:00

es1

progs/es1: Update .gitignore.

2010-02-17 22:32:10 +08:00

es2

progs/es2: Fix an assertion failure in tri.

2010-02-02 10:45:00 +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

gallium

Merge branch 'gallium-vertexelementcso'

2010-03-09 15:59:40 +01:00

glsl

progs/glsl: Ensure CFLAGS are passed during linking

2010-02-26 11:05:54 -08: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

openvg

progs/openvg: Add .gitignore.

2010-02-17 22:32:10 +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

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

Merge branch '7.8'

2010-03-22 09:07:46 -06: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: added comments

2010-03-17 16:29:34 -06: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

Use X_LIBS from pkg-config, instead of libdir, for locating libX11

2010-03-13 11:42:24 -08: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: Add unit tests for pixel format packing/unpacking.

2010-02-27 20:29:14 +00:00