diff options
author | Jakob Bornecrantz <jakob@tungstengraphics.com> | 2008-05-26 13:04:25 +0200 |
---|---|---|
committer | Jakob Bornecrantz <jakob@tungstengraphics.com> | 2008-05-26 13:04:25 +0200 |
commit | e3ddafd1d32192f4638d4930627ad66624325561 (patch) | |
tree | d538b76af6c559593c6507ad7c2eb415d1b28c75 /src/glu/sgi | |
parent | 359058e7b77ddbac5eec7e8d1c77232bcbb1adbf (diff) | |
parent | 7fbb61eedd4b07f07007a172cea227d5c363b908 (diff) |
Merge branch 'gallium-tex-surface' into gallium-0.1
Conflicts:
src/gallium/include/pipe/p_util.h
Diffstat (limited to 'src/glu/sgi')
0 files changed, 0 insertions, 0 deletions