Brian Paul e7cb125b2d Merge branch 'mesa_7_5_branch' ...

Conflicts:

	Makefile
	src/mesa/main/version.h

2009-05-11 16:27:50 -06:00

..

beos

Remove CVS keywords.

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

demos

demos: delete vertex array objects upon exit

2009-05-07 14:34:09 -06:00

directfb

Ignore more generated files in progs/

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

egl

egl: eglinfo load i915 driver

2009-01-19 02:29:54 +01:00

fbdev

Merge branch 'gallium-0.1' into gallium-0.2

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

fp

tests: another extended swizzle test

2009-04-15 19:55:28 -06:00

ggi

Remove CVS keywords.

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

glsl

progs/glsl: Update ignore

2009-04-19 16:23:49 +01: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

osdemos

minor changes

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

redbook

progs: add fflushes for cygwin

2009-04-28 18:15:17 +01:00

samples

demos: use larger buffer for snprintf() call, see bug 21220

2009-04-16 09:25:52 -06:00

slang

Merge branch 'gallium-0.1' into gallium-0.2

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

tests

progs/tests: Update ignores

2009-04-29 20:44:03 +01:00

tools/trace

fix gltrace (bug 16691)

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

trivial

trivial: destroy window upon exit

2009-05-11 16:08:01 -06:00

util

progs: Try to read the texture from the current dir, if full path fails.

2009-03-16 12:01:44 +00:00

vp

progs/vp: more psiz tests

2009-03-25 10:07:28 +00:00

vpglsl

vpglsl: add missing SConscript

2009-03-23 19:01:40 +00:00

wgl

wgl: Note down the gallium pixel formats, instead of re-guessing them.

2009-04-10 19:50:35 +01:00

windml

Remove CVS keywords.

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

xdemos

demos: ensure display lists are destroyed for next generation

2009-04-24 16:45:36 +01:00

Makefile

Never fail `make clean'

2008-05-07 11:35:23 -07:00

SConscript

progs: Build the wgl examples with scons.

2009-03-18 16:40:57 +00:00

SConstruct

scons: Build the progs into seperate dirs as well.

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