Conflicts: dix/dispatch.c dix/property.c hw/xfree86/common/xf86VidMode.c include/xkbsrv.h render/glyph.c xkb/xkbActions.c |
||
---|---|---|
.. | ||
fullscreen.c | ||
quartzCursor.c | ||
quartzCursor.h |
Conflicts: dix/dispatch.c dix/property.c hw/xfree86/common/xf86VidMode.c include/xkbsrv.h render/glyph.c xkb/xkbActions.c |
||
---|---|---|
.. | ||
fullscreen.c | ||
quartzCursor.c | ||
quartzCursor.h |