a52c9b2a59
Conflicts: dix/dispatch.c dix/property.c hw/xfree86/common/xf86VidMode.c include/xkbsrv.h render/glyph.c xkb/xkbActions.c |
||
---|---|---|
.. | ||
compalloc.c | ||
compext.c | ||
compinit.c | ||
compint.h | ||
compwindow.c | ||
Makefile.am |
a52c9b2a59
Conflicts: dix/dispatch.c dix/property.c hw/xfree86/common/xf86VidMode.c include/xkbsrv.h render/glyph.c xkb/xkbActions.c |
||
---|---|---|
.. | ||
compalloc.c | ||
compext.c | ||
compinit.c | ||
compint.h | ||
compwindow.c | ||
Makefile.am |