diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-12-21 19:18:41 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-12-21 19:18:41 +0000 |
| commit | a5585cb533af3d4e5d5324d5f526447b98597402 (patch) | |
| tree | 6706dbb8b4f994b919e247647c3e8853d067b45c /configs/linux-dri | |
| parent | d288a30610767f87e3e7c069730d4bc255246568 (diff) | |
| parent | 574715d8368f99c0a5720a9676385d58d6cfdf30 (diff) | |
Merge commit 'origin/master' into i965g-restart
Conflicts:
SConstruct
configs/default
configs/linux-dri
Diffstat (limited to 'configs/linux-dri')
| -rw-r--r-- | configs/linux-dri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configs/linux-dri b/configs/linux-dri index b2394d1392..c54583a0c8 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -60,7 +60,7 @@ EGL_DRIVERS_DIRS = demo glx DRIVER_DIRS = dri WINDOW_SYSTEM = dri GALLIUM_WINSYS_DIRS = drm -GALLIUM_WINSYS_DRM_DIRS = intel i965 -GALLIUM_STATE_TRACKERS_DIRS = egl dri +GALLIUM_WINSYS_DRM_DIRS = vmware intel i965 +GALLIUM_STATE_TRACKERS_DIRS = egl DRI_DIRS = i915 i965 |