| commit | c6ef705e414c8e93ee471f50d15ada3492a9b067 | [log] [tgz] |
|---|---|---|
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | Mon Jan 11 15:23:29 2010 -0500 |
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | Mon Jan 11 15:23:29 2010 -0500 |
| tree | 5b037def16eaa6e58860f7b66d79fd75067a0cb2 | |
| parent | cca66dbb59673168d57b4e3499ccc31f4ddc86ad [diff] | |
| parent | 7c50d29f7ced3d60e52ee0146d982b49ea421de2 [diff] |
Merge branch 'master' of ssh://people.freedesktop.org/~jbarnes/mesa Conflicts due to DRI1 removal: src/mesa/drivers/dri/intel/intel_context.c src/mesa/drivers/dri/intel/intel_screen.c