diff options
| author | Brian Paul <brianp@vmware.com> | 2009-05-18 10:36:50 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-05-18 10:36:50 -0600 |
| commit | edfbf7dccb1d90ebedfa08fe06e1db7fff9f94d4 (patch) | |
| tree | 0e224de2fac2fc5c632b2398a372b658c66a36d7 /src/mesa/main/texobj.h | |
| parent | 27206add2738f9813d1e9f42fe3b1bdfbd9b8aa4 (diff) | |
| parent | 7ce105d2e6885eeac73c59dc14c4cd59a89c1425 (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
Makefile
src/mesa/main/version.h
Diffstat (limited to 'src/mesa/main/texobj.h')
0 files changed, 0 insertions, 0 deletions