Brian Paul e97681c7f5 mesa: merge gallium-0.2 into gallium-master-merge ...

Merge commit 'origin/gallium-0.2' into gallium-master-merge

Conflicts:

	Makefile
	docs/relnotes-7.4.html
	docs/relnotes.html
	src/mesa/drivers/dri/i965/brw_wm.h
	src/mesa/main/imports.c
	src/mesa/main/mtypes.h
	src/mesa/main/texcompress.c
	src/mesa/main/texenvprogram.c
	src/mesa/main/version.h
	src/mesa/vbo/vbo_exec_api.c
	src/mesa/vbo/vbo_save_draw.c

2009-02-09 09:22:22 -07:00

..

mini

Remove CVS keywords.

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

x11

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