diff options
| author | Brian Paul <brianp@vmware.com> | 2009-07-17 22:00:47 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-07-17 22:00:47 -0600 |
| commit | b96ae1b2c463d6d99ee0418083ef68f4027b7cd7 (patch) | |
| tree | f34f89c267b940eb7408475bd0c2ff57c7fbe992 /.gitattributes | |
| parent | f81f57e25db18b1c69f2f8076380603340fa2cda (diff) | |
| parent | cd10996d4f517c69e306eaf6dfb0654432651b3a (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
Makefile
progs/glsl/multitex.c
src/mesa/main/enums.c
src/mesa/main/state.c
src/mesa/main/texenvprogram.c
src/mesa/main/version.h
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions