diff options
| author | Keith Whitwell <[email protected]> | 2009-03-03 11:51:14 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2009-03-03 11:51:14 +0000 |
| commit | 916de35d677ca5238e9515840fa5aa9f81302c5b (patch) | |
| tree | 73a8a2443c3de43d253a38528335e39b40b391dc /.gitignore | |
| parent | 72cf6e8e92e49753472e760b1cf4575327b48f43 (diff) | |
| parent | 2785af803f7d6d64ff17c10645e5f10499289ed0 (diff) | |
Merge commit 'origin/gallium-0.1'
Conflicts:
scons/gallium.py
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/gallium/include/pipe/p_defines.h
src/mesa/vbo/vbo_exec_api.c
src/mesa/vbo/vbo_exec_draw.c
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions