summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/enable.h
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2009-08-18 12:20:36 -0700
committerIan Romanick <[email protected]>2009-08-18 12:20:36 -0700
commita512985fd81c1ed4ccc5e69aaa05015cf7ff844d (patch)
tree69e6e898deaeaed2b4dfb5851707c68261c464de /src/mesa/main/enable.h
parent0b5af41c6fae2809f4567a7cecbd207e5e4f3ab5 (diff)
parentc80bc3abcd3939e5e2d45aea4b01ff22bfec244b (diff)
Merge branch 'master' into asm-shader-rework-1
Conflicts: src/mesa/shader/arbprogparse.c
Diffstat (limited to 'src/mesa/main/enable.h')
0 files changed, 0 insertions, 0 deletions