diff options
| author | Michal Krol <michal@vmware.com> | 2010-03-02 13:35:30 +0100 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2010-03-02 13:35:30 +0100 |
| commit | 4ca70c489baed3e23dbf5e5e5794385113e22252 (patch) | |
| tree | c2fb1cc4f46e2ffe2c84ce4680fc68fed29f02de /src/mesa/drivers/ggi/display/.gitignore | |
| parent | c1c7fa5192c4fb3f51fb67c81e58713d61ff0c93 (diff) | |
| parent | ff9ddf4d39be9e36d3e1dd9e10e889efa40dfb1e (diff) | |
Merge branch 'gallium-no-rhw-position'
Conflicts:
src/gallium/drivers/r300/r300_blit.c
src/gallium/drivers/r300/r300_emit.c
src/gallium/drivers/r300/r300_state_derived.c
Diffstat (limited to 'src/mesa/drivers/ggi/display/.gitignore')
0 files changed, 0 insertions, 0 deletions