diff options
author | Jakob Bornecrantz <[email protected]> | 2008-05-28 12:42:42 +0200 |
---|---|---|
committer | Jakob Bornecrantz <[email protected]> | 2008-05-28 12:42:42 +0200 |
commit | 938d9d596324e411fde5312f2bb65b444c502c37 (patch) | |
tree | f32087f7c61f0827980278a5dae2b32edf534b72 /progs/miniglx/.gitignore | |
parent | 5d90f97f48f8ba231d52bb1a4758dd37f81ec8d6 (diff) | |
parent | 7b85ea19de09d4e7e077ca147528e90e52683690 (diff) |
Merge branch 'gallium-vertex-linear' into gallium-0.1
Conflicts:
src/gallium/auxiliary/draw/draw_pt_varray.c
Diffstat (limited to 'progs/miniglx/.gitignore')
0 files changed, 0 insertions, 0 deletions