summaryrefslogtreecommitdiffstats
path: root/src/mesa/pipe/nv50/nv50_context.c
diff options
context:
space:
mode:
authorBen Skeggs <[email protected]>2008-02-16 16:30:22 +1100
committerBen Skeggs <[email protected]>2008-02-16 16:30:22 +1100
commit87e3301533aa4d3e6e98db139887ebba3d217f7d (patch)
treead80803f8f90263ea4c9adf9b3e7dd8eae4b05fa /src/mesa/pipe/nv50/nv50_context.c
parent49405c43f245d3b3ddd12e891413bf7ead23145c (diff)
parent3320b1874e810583f95b93a89697b2955987b84f (diff)
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
Conflicts: configs/linux-dri src/mesa/pipe/Makefile
Diffstat (limited to 'src/mesa/pipe/nv50/nv50_context.c')
0 files changed, 0 insertions, 0 deletions