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

..

EGL

egl: define vsnprintf

2008-08-06 16:42:38 -06:00

GL

Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into gallium-0.2

2008-09-11 17:32:18 +01:00

GLES

Remove CVS keywords.

2008-08-31 17:43:20 +09:00

GLES2

Remove CVS keywords.

2008-08-31 17:43:20 +09:00

GLView.h

Stupid me. I don't know why I moved the GLView.h here at first, but now I know why

2004-08-16 08:39:36 +00:00