diff options
author | Jesse Barnes <jbarnes@hobbes.lan> | 2008-07-31 13:10:19 -0700 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-07-31 13:10:19 -0700 |
commit | 2aaa207db2cea03ba05c439b5074807689f2c5be (patch) | |
tree | 970cd841b6e15e455665bf77cec027647ed74727 /man | |
parent | 2049ba211e7cdc383976c09f52c2b43acdd59481 (diff) | |
parent | 76eb8e6f1f0c6962b23550564f4273f392567857 (diff) |
Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel
Conflicts:
src/i830_display.c
Diffstat (limited to 'man')
0 files changed, 0 insertions, 0 deletions