mesa/progs
Brian Paul 5340b6dff7 Merge commit 'origin/gallium-master-merge'
This is the big merge of the gallium-0.2 branch into master.
gallium-master-merge was just the staging area for it.
Both gallium-0.2 and gallium-master-merge are considered closed now.

Conflicts:

	progs/demos/Makefile
	src/mesa/main/state.c
	src/mesa/main/texenvprogram.c
2009-02-10 16:44:02 -07:00
..
beos Remove CVS keywords. 2008-09-21 11:00:44 -07:00
demos Merge commit 'origin/gallium-master-merge' 2009-02-10 16:44:02 -07: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 Merge commit 'origin/gallium-0.1' into gallium-0.2 2008-09-21 12:22:21 -07:00
ggi Remove CVS keywords. 2008-09-21 11:00:44 -07:00
glsl mesa: merge gallium-0.2 into gallium-master-merge 2009-02-09 09:22:22 -07: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: Build rebook with scons too. 2009-02-10 20:18:52 +00:00
samples progs: Build samples dir with scons and glew. 2009-02-10 20:28:08 +00:00
slang Merge branch 'gallium-0.1' into gallium-0.2 2008-09-11 16:05:15 +01:00
tests mesa: merge gallium-0.2 into gallium-master-merge 2009-02-09 09:22:22 -07:00
tools/trace fix gltrace (bug 16691) 2008-07-14 08:50:36 -06:00
trivial progs: Get more samples building on windows. 2009-02-01 12:00:17 +00:00
util mesa: merge gallium-0.2 into gallium-master-merge 2009-02-09 09:22:22 -07:00
vp progs: Port vp-tris to glew. 2009-01-23 17:09:51 +00:00
vpglsl mesa: fix build 2008-11-14 14:30:49 +00:00
windml Remove CVS keywords. 2008-09-21 11:00:44 -07:00
xdemos mesa: merge gallium-0.2 into gallium-master-merge 2009-02-09 09:22:22 -07:00
Makefile Never fail `make clean' 2008-05-07 11:35:23 -07:00
SConscript progs: Build samples dir with scons and glew. 2009-02-10 20:28:08 +00:00
SConstruct scons: Build the progs into seperate dirs as well. 2009-01-24 15:56:28 +00:00