| commit | 06d3732a9094030fc33120f16f162e0d405f132c | [log] [tgz] |
|---|---|---|
| author | Keith Whitwell <keithw@vmware.com> | Tue Dec 01 10:57:37 2009 +0000 |
| committer | Keith Whitwell <keithw@vmware.com> | Tue Dec 01 10:57:37 2009 +0000 |
| tree | 185159951093f49f1877e78eaf01f6d1ea01e560 | |
| parent | 853d4807fe220b17cf5af5a76b24f2466238013b [diff] | |
| parent | f17dbe256bb38c35d885260be7e5856f1561de97 [diff] |
Merge commit 'origin/mesa_7_7_branch' Conflicts: src/gallium/drivers/svga/svga_screen_texture.c src/gallium/state_trackers/xorg/xorg_composite.c src/gallium/state_trackers/xorg/xorg_exa.c src/gallium/state_trackers/xorg/xorg_renderer.c src/gallium/state_trackers/xorg/xorg_xv.c src/mesa/main/texgetimage.c src/mesa/main/version.h