| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2006-09-27 | Merge branch 'master' into modesetting | Eric Anholt | |
| This reverts most of the mergedfb code. This will instead be done in device- independent RandR code. Conflicts: src/Makefile.am src/i810_driver.c src/i810_reg.h src/i830.h src/i830_cursor.c src/i830_driver.c src/i830_modes.c src/i830_video.c | |||
| 2006-07-18 | Merge branch 'master' into textured-video | Eric Anholt | |
| This moves the i915 textured video implementation into i915_video.c to avoid conflicts in register definitions with i830_reg.h when we use i915_reg.h. This also means that i810_reg.h's i915 3D regs definitions are removed and replaced with i915_reg.h usage. Conflicts: src/i830_rotate.c | |||
 |
index : driver/xf86-video-intel | |
| Intel video cards driver |
| summaryrefslogtreecommitdiff |