Eric Anholt 49d402e275 Merge remote branch 'origin/mesa_7_6_branch' ...

Conflicts:
	src/mesa/drivers/dri/intel/intel_fbo.c
	src/mesa/drivers/dri/intel/intel_mipmap_tree.c
	src/mesa/drivers/dri/intel/intel_mipmap_tree.h
	src/mesa/drivers/dri/intel/intel_tex_copy.c
	src/mesa/drivers/dri/intel/intel_tex_image.c

2009-10-23 15:21:05 -07:00

..

beos

Remove CVS keywords.

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

demos

progs/demos: add fps to multiarb

2009-10-23 13:56:07 +01: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

tgsi: handle some src/dst aliasing in tgsi_sse2.c

2009-09-13 11:59:24 -07:00

ggi

Remove CVS keywords.

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

glsl

Merge branch 'mesa_7_6_branch'

2009-10-05 14:42:08 -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

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: Ignores!

2009-10-09 14:00:15 +01:00

rbug

progs/rbug: Link to math

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

redbook

progs: add fflushes for cygwin

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

samples

progs/samples: added test/debug code for culling

2009-08-31 19:34:47 -06:00

slang

demos: use glEnable/DisableClientState() for vertex arrays

2009-07-08 13:58:30 -06:00

tests

Merge remote branch 'origin/mesa_7_6_branch'

2009-10-23 15:21:05 -07:00

tools/trace

fix gltrace (bug 16691)

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

trivial

Merge branch 'mesa_7_6_branch' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa

2009-10-22 12:02:31 -04:00

util

progs/util: minor updates to glutskel.c

2009-08-30 09:10:36 -06:00

vp

Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

2009-09-15 09:45:18 -06:00

vpglsl

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

2009-06-01 18:40:21 -07: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

progs/xdemos: fix command line flag typo

2009-10-22 17:11:59 -06:00

Makefile

progs/Makefile: remove extra quoting

2009-10-14 09:37:53 -06: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