Conflicts: dix/getevents.c hw/xfree86/common/xf86Xinput.h Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> |
||
|---|---|---|
| .. | ||
| int10 | ||
| Makefile.am | ||
| lnx_acpi.c | ||
| lnx_agp.c | ||
| lnx_apm.c | ||
| lnx_axp.c | ||
| lnx_bell.c | ||
| lnx_ev56.c | ||
| lnx_init.c | ||
| lnx_kmod.c | ||
| lnx_video.c | ||
Conflicts: dix/getevents.c hw/xfree86/common/xf86Xinput.h Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> |
||
|---|---|---|
| .. | ||
| int10 | ||
| Makefile.am | ||
| lnx_acpi.c | ||
| lnx_agp.c | ||
| lnx_apm.c | ||
| lnx_axp.c | ||
| lnx_bell.c | ||
| lnx_ev56.c | ||
| lnx_init.c | ||
| lnx_kmod.c | ||
| lnx_video.c | ||