Conflicts: dix/devices.c dix/events.c |
||
|---|---|---|
| .. | ||
| Makefile.am | ||
| i810.c | ||
| i810.h | ||
| i810_cursor.c | ||
| i810_reg.h | ||
| i810_video.c | ||
| i810draw.c | ||
| i810draw.h | ||
| i810stub.c | ||
Conflicts: dix/devices.c dix/events.c |
||
|---|---|---|
| .. | ||
| Makefile.am | ||
| i810.c | ||
| i810.h | ||
| i810_cursor.c | ||
| i810_reg.h | ||
| i810_video.c | ||
| i810draw.c | ||
| i810draw.h | ||
| i810stub.c | ||