diff options
| author | Michel Daenzer <daenzer@loki.lorrainebruecke.local> | 2006-07-26 16:02:07 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2006-08-03 12:45:08 +0200 |
| commit | 9de55a44f95f251df365f29884a1ff17492b470d (patch) | |
| tree | c7db65f228ee6ac495020921d6f7d0c014b61e4e /man/Makefile.am | |
| parent | d140055f5be6185f634f7d13683c36ed698eb89a (diff) | |
Merge branch 'master' of ssh+git://git.freedesktop.org/git/xorg/driver/xf86-video-intel into i810_texman_0_1_branchi810_texman_0_1_branch
Conflicts:
ChangeLog - removed
src/i810_driver.c
src/i830_dri.c
src/i830_driver.c
src/i830_memory.c
Diffstat (limited to 'man/Makefile.am')
0 files changed, 0 insertions, 0 deletions