diff options
| author | Ian Romanick <idr@us.ibm.com> | 2006-12-11 15:06:03 -0800 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2006-12-11 15:06:03 -0800 |
| commit | d0e03622811fd94c830c0b5233ff505392c0d331 (patch) | |
| tree | d52e44dc616a677e9f2901d36f99e0ed579cf87e /Makefile.am | |
| parent | 8fee907cac7e5924630e3648bfb72ad9bd021ea8 (diff) | |
| parent | 1dd6e6995d7a37338dce6ee5b1aa4ee9dd848e1d (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
Conflicts:
src/mga_macros.h
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions