diff options
| author | Brian Paul <brianp@vmware.com> | 2009-06-15 16:42:42 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-06-15 16:42:42 -0600 |
| commit | 70d247c69bcef4f40b640ae61e9fb9ebc5887bb6 (patch) | |
| tree | 12c7b32a969b64f4a1ef2324f2321e673634295c /.gitignore | |
| parent | 01f7bda44c92268fa288bbd8f53af3a3620bd315 (diff) | |
| parent | 8d0f72e8f901e12841408b95963d43684fb6ce48 (diff) | |
Merge branch 'arb_map_buffer_range'
Conflicts:
docs/relnotes-7.6.html
src/mesa/main/mtypes.h
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions