From: Ben Skeggs <skeggsb@gmail.com>
Date: Sun, 25 May 2008 04:19:18 +0000 (+1000)
Subject: Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=92120851947ad4a47d2150a7cf3f8dc5fdde396c;hp=-c;p=mesa.git

Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
---

92120851947ad4a47d2150a7cf3f8dc5fdde396c
diff --combined configs/linux-dri
index bf7881937e4,cd82c571c7d..4fdef196d96
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@@ -59,10 -59,12 +59,12 @@@ SRC_DIRS := egl $(SRC_DIRS
  PROGRAM_DIRS = egl
  endif
  
+ 
+ 
  DRIVER_DIRS = dri
- WINDOW_SYSTEM=dri
+ WINDOW_SYSTEM = dri
  GALLIUM_WINSYS_DIRS = dri
  
  # gamma are missing because they have not been converted to use the new
  # interface.
 -DRI_DIRS = intel 
 +DRI_DIRS = nouveau