mesa.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'glsl2'	Ian Romanick	2010-08-16	1	-0/+35
\|\ \| \| \| \| \| \| \| \|	Conflicts: src/mesa/program/prog_optimize.c
\| *	glsl2: remove stray semicolon	Brian Paul	2010-08-11	1	-1/+1
\| \|
\| *	Merge remote branch 'origin/master' into glsl2	Eric Anholt	2010-07-26	1	-0/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This pulls in multiple i965 driver fixes which will help ensure better testing coverage during development, and also gets past the conflicts of the src/mesa/shader -> src/mesa/program move. Conflicts: src/mesa/Makefile src/mesa/main/shaderapi.c src/mesa/main/shaderobj.h
* \|	mesa: Remove unnecessary header from hash_table.h.	Vinson Lee	2010-08-11	1	-2/+0
\|/
*	mesa: rename src/mesa/shader/ to src/mesa/program/	Brian Paul	2010-06-10	1	-0/+117