KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mesa/progs
History
Keith Whitwell cc7dd4fc1b Merge commit 'origin/gallium-0.1' into gallium-0.2 
Conflicts:

	Makefile
	progs/demos/Makefile
	progs/glsl/Makefile
	progs/redbook/Makefile
	progs/samples/Makefile
	progs/tests/Makefile
	progs/trivial/Makefile
	progs/xdemos/Makefile
	src/gallium/Makefile
	src/mesa/main/attrib.c
	src/mesa/main/bufferobj.c
	src/mesa/vbo/vbo_exec_draw.c
 		2008-09-11 18:32:05 +01:00
..
beos Merge branch 'gallium-0.1' into gallium-0.2 2008-09-11 16:05:15 +01:00
demos Merge commit 'origin/gallium-0.1' into gallium-0.2 2008-09-11 18:32:05 +01:00
directfb Ignore more generated files in progs/ 2008-05-20 19:04:57 -04:00
egl Merge branch 'gallium-0.1' into gallium-0.2 2008-09-11 16:05:15 +01:00
fbdev Merge branch 'gallium-0.1' into gallium-0.2 2008-09-11 16:05:15 +01:00
fp Merge branch 'gallium-0.1' into gallium-0.2 2008-09-11 16:05:15 +01:00
ggi Remove CVS keywords. 2008-05-26 20:14:40 +09:00
glsl Merge commit 'origin/gallium-0.1' into gallium-0.2 2008-09-11 18:32:05 +01:00
images new test image - Delicate Arch, Utah 2006-05-10 22:44:26 +00:00
miniglx Merge branch 'gallium-0.1' into gallium-0.2 2008-09-11 16:05:15 +01:00
osdemos minor changes 2008-06-05 15:37:17 -06:00
redbook Merge commit 'origin/gallium-0.1' into gallium-0.2 2008-09-11 18:32:05 +01:00
samples Merge commit 'origin/gallium-0.1' into gallium-0.2 2008-09-11 18:32:05 +01:00
slang Merge branch 'gallium-0.1' into gallium-0.2 2008-09-11 16:05:15 +01:00
tests Merge commit 'origin/gallium-0.1' into gallium-0.2 2008-09-11 18:32:05 +01:00
tools/trace fix gltrace (bug 16691) 2008-07-14 08:50:36 -06:00
trivial Merge commit 'origin/gallium-0.1' into gallium-0.2 2008-09-11 18:32:05 +01:00
util Merge branch 'gallium-0.1' into gallium-0.2 2008-09-11 16:05:15 +01:00
vp Merge branch 'gallium-0.1' into gallium-0.2 2008-09-11 16:05:15 +01:00
vpglsl add some glsl example testing different arrays of uniforms 2008-06-12 14:15:37 -04:00
windml Remove CVS keywords. 2008-05-26 20:14:40 +09:00
xdemos Merge commit 'origin/gallium-0.1' into gallium-0.2 2008-09-11 18:32:05 +01:00
Makefile Never fail `make clean' 2008-05-07 11:35:23 -07:00