| commit | a01e0afd9fc0d647081c6903baa1a7ba505c4b05 | [log] [tgz] |
|---|---|---|
| author | Jakob Bornecrantz <jakob@vmware.com> | Mon Jun 28 20:59:09 2010 +0200 |
| committer | Jakob Bornecrantz <jakob@vmware.com> | Mon Jun 28 21:14:45 2010 +0200 |
| tree | 7e04eb2b4e87137455920f6131b064dc87056e14 | |
| parent | 250b92f3bb4fc4a53f3150b0e8ff1e121a5adbc7 [diff] | |
| parent | 9ca563a9a8573bf79821abc75ccf0fdade19c8a9 [diff] |
Merge branch 'gallium-drm-driver-drescriptor' Conflicts: src/gallium/state_trackers/egl/x11/native_dri2.c src/gallium/state_trackers/egl/x11/native_x11.c src/gallium/state_trackers/egl/x11/native_x11.h src/gallium/state_trackers/xorg/xorg_driver.c src/gallium/winsys/radeon/drm/radeon_drm.c