| commit | 2689dd304c6d644b04c941e6da63e466be5de0d6 | [log] [tgz] |
|---|---|---|
| author | Brian Paul <brianp@vmware.com> | Tue Mar 23 09:14:17 2010 -0600 |
| committer | Brian Paul <brianp@vmware.com> | Tue Mar 23 09:14:17 2010 -0600 |
| tree | 26e2878e1d4457205254fcdcc877e3c192e0cec5 | |
| parent | 83f4c444f4e630fe2bfd17ad750f3f17ceff13f6 [diff] | |
| parent | ff54af530bc17429eda73a761dd6b73e3ec0d6ef [diff] |
Merge branch '7.8' Conflicts: Makefile src/gallium/state_trackers/glx/xlib/xm_api.c src/mesa/drivers/dri/intel/intel_blit.c src/mesa/drivers/dri/intel/intel_pixel_copy.c src/mesa/main/version.h