diff options
| author | Brian Paul <[email protected]> | 2009-09-22 13:44:43 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-09-22 13:44:43 -0600 |
| commit | ba002eb1965ccdb09d7c3657d32e22e71ed4096a (patch) | |
| tree | 883c15ca428980c27624f4ba3f5fd1bd421e4718 /.gitattributes | |
| parent | 8cc12ffb34769a84050be034d19921af811a3406 (diff) | |
| parent | bc7546476078dd520af4853f6f0d3f577ec670ec (diff) | |
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
Conflicts:
src/mesa/main/bufferobj.c
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions