summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/macros.h
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2009-01-02 16:32:26 -0700
committerBrian Paul <[email protected]>2009-01-02 16:32:26 -0700
commit0815ebccfc0a12d8f3e831928f1c4210b7f75ad8 (patch)
tree1e7db7e1d44e741215e5b4b11d33df91fe5b39a0 /src/mesa/main/macros.h
parenteb9bbc5265562cb6f93688fc027ea76f91601e37 (diff)
parent1fad6ccb756ae33ca3115f59c99ca8abbeb0321e (diff)
Merge commit 'origin/master' into gallium-0.2
Conflicts: src/mesa/main/ffvertex_prog.c src/mesa/main/texenvprogram.c
Diffstat (limited to 'src/mesa/main/macros.h')
0 files changed, 0 insertions, 0 deletions