summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2008-02-16 16:20:40 +1100
committerBen Skeggs <skeggsb@gmail.com>2008-02-16 16:20:40 +1100
commit49405c43f245d3b3ddd12e891413bf7ead23145c (patch)
treec6969454265b133f6be8c04b2ba193aecf90e4a7 /configs
parent263de4b814eb78cc971ad28f173985b61b77465c (diff)
parent4d9c19d2f7eef263b49485b6e65be9afbe58363a (diff)
Merge branch 'nouveau-gallium-0.1' into darktama-gallium-0.1
Conflicts: src/mesa/pipe/nouveau/nouveau_stateobj.h src/mesa/pipe/nv40/nv40_context.c src/mesa/pipe/nv40/nv40_miptree.c
Diffstat (limited to 'configs')
-rw-r--r--configs/linux-dri2
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/linux-dri b/configs/linux-dri
index 936fce9982..c7eb7112c0 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -66,4 +66,4 @@ WINDOW_SYSTEM=dri
# gamma are missing because they have not been converted to use the new
# interface.
-DRI_DIRS = intel_winsys
+DRI_DIRS = nouveau_winsys