diff options
| author | Roland Scheidegger <[email protected]> | 2009-12-04 00:35:14 +0100 |
|---|---|---|
| committer | Roland Scheidegger <[email protected]> | 2009-12-04 00:35:14 +0100 |
| commit | 9c6a9363ef96c00dd0ad63e340b32479e43fea45 (patch) | |
| tree | c1752752623301c7bc63d25173c396794b74922d /.gitignore | |
| parent | cc8a537c57a62a196106b592e510e4c93bd1826e (diff) | |
| parent | 94b5c28a98850f42fbcdab9ceda1450279e1e6fd (diff) | |
Merge branch 'gallium-noblocks'
Conflicts:
src/gallium/state_trackers/xorg/xorg_exa.c
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions