Jakob Bornecrantz ee98ae5a29 Merge branch 'mesa_7_5_branch' ...

Conflicts:

	Makefile
	src/mesa/main/version.h
	src/mesa/shader/slang/slang_preprocess.c
	src/mesa/state_tracker/st_cb_bufferobjects.c

2009-06-09 07:53:25 +02: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

Merge branch 'mesa_7_5_branch'

2009-06-01 15:01:33 -06: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

rbug

progs/rbug: Add small remote debugging cli applications

2009-06-01 11:39:25 +01:00

redbook

progs: add fflushes for cygwin

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

samples

demos: remove some old debug/test code

2009-05-27 19:37:32 -06:00

slang

Merge branch 'gallium-0.1' into gallium-0.2

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

tests

Merge branch 'mesa_7_5_branch'

2009-06-09 07:53:25 +02:00

tools/trace

fix gltrace (bug 16691)

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

trivial

Merge branch 'mesa_7_5_branch'

2009-06-04 13:16:13 -06:00

util

demos/util: add funcs for GL_ARB_buffer_object

2009-05-22 13:12:01 -06:00

vp

progs/vp: more psiz tests

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

vpglsl

progs/vpglsl: add similar support for point rendering as progs/vp

2009-06-01 18:40:21 -07:00

wgl

progs/wgl: Small cleanup to wglinfo.

2009-06-01 18:23:20 -07: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