diff options
| author | Alex Deucher <alex@botch2.(none)> | 2007-11-30 16:40:28 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@botch2.(none)> | 2007-11-30 16:40:28 -0500 |
| commit | af0196f7bf0d1d5d211391149c18935d64ed2b06 (patch) | |
| tree | 5d88a8945a06894658dcfeca18f7e1f98b8447cf /.gitignore | |
| parent | d9858a2b3744b99003cfb9f31b743a2d31b322e9 (diff) | |
| parent | 0175b79987ef4d7b0ce8238c3bdde989e504516a (diff) | |
Merge branch 'master' of ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati into atombios-support
merge master and fix conflicts
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions