| Conflicts: Xi/exevents.c dix/devices.c dix/getevents.c include/dix.h mi/mieq.c | ||
|---|---|---|
| .. | ||
| Makefile.am | ||
| xtrapddmi.c | ||
| xtrapdi.c | ||
| xtrapdiswp.c | ||
| xtrapditbl.c | ||
| Conflicts: Xi/exevents.c dix/devices.c dix/getevents.c include/dix.h mi/mieq.c | ||
|---|---|---|
| .. | ||
| Makefile.am | ||
| xtrapddmi.c | ||
| xtrapdi.c | ||
| xtrapdiswp.c | ||
| xtrapditbl.c | ||