summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nv40/nv40_screen.c
diff options
context:
space:
mode:
authorJakob Bornecrantz <[email protected]>2009-07-03 18:53:58 +0200
committerJakob Bornecrantz <[email protected]>2009-07-03 18:53:58 +0200
commit862488075c5537b0613753b0d14c267527fc6199 (patch)
treefd4d51272c86fbc88c12e2d16649547f3ca7b8df /src/gallium/drivers/nv40/nv40_screen.c
parent060c7f2321f72503c14f9f3f7bb27d59d8a90224 (diff)
parent94e1117c9ba259665cd8e790369dcd4c789a2f93 (diff)
Merge branch 'mesa_7_5_branch'
Conflicts: src/mesa/main/dlist.c src/mesa/vbo/vbo_save_api.c
Diffstat (limited to 'src/gallium/drivers/nv40/nv40_screen.c')
0 files changed, 0 insertions, 0 deletions