diff options
| author | Brian Paul <brianp@vmware.com> | 2009-06-26 17:07:07 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-06-26 17:07:07 -0600 |
| commit | a18e209edb5348eb167e9d7184597031bbbbe622 (patch) | |
| tree | 60fcd288119f335cccdc2f15981c9b315d332e64 /src/mesa/drivers/dri/mga | |
| parent | 4fdc6ad41b843109febbe9596dde87f676a8b0e9 (diff) | |
| parent | 418987ff05f892d3c33ed4ddbe856c496b05ea14 (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
Makefile
src/gallium/drivers/softpipe/sp_screen.c
src/mesa/main/version.h
Diffstat (limited to 'src/mesa/drivers/dri/mga')
0 files changed, 0 insertions, 0 deletions