summaryrefslogtreecommitdiff
path: root/src/mesa/program/hash_table.h
AgeCommit message (Collapse)Author
2010-08-16Merge branch 'glsl2'Ian Romanick
Conflicts: src/mesa/program/prog_optimize.c
2010-08-11glsl2: remove stray semicolonBrian Paul
2010-08-11mesa: Remove unnecessary header from hash_table.h.Vinson Lee
2010-07-26Merge remote branch 'origin/master' into glsl2Eric Anholt
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
2010-06-10mesa: rename src/mesa/shader/ to src/mesa/program/Brian Paul