diff options
author | Tilman Sauerbeck <tilman@code-monkey.de> | 2007-04-16 20:47:57 +0200 |
---|---|---|
committer | Tilman Sauerbeck <tilman@code-monkey.de> | 2007-04-16 20:47:57 +0200 |
commit | 370c1d36f9e3025870f41e39c06b12689d51e688 (patch) | |
tree | 0bc13a92b46c77b82440a7e44b7938e82505f4b8 /src/mga_bios.c | |
parent | 3bdda29f071f9e205530472cde96372ba2731876 (diff) | |
parent | 7b080d993ceda7b181e0611ed0c997c8aecc9ad7 (diff) |
Merge branch 'master' into randr-1.2
Conflicts:
src/mga.h
src/mga_dacG.c
src/mga_dri.c
src/mga_driver.c
Diffstat (limited to 'src/mga_bios.c')
0 files changed, 0 insertions, 0 deletions