e34fcd2bf4
Conflicts: dix/devices.c dix/property.c include/dix.h |
||
|---|---|---|
| .. | ||
| Makefile.am | ||
| XIstubs.h | ||
| bstore.h | ||
| bstorestr.h | ||
| closestr.h | ||
| closure.h | ||
| colormap.h | ||
| colormapst.h | ||
| cursor.h | ||
| cursorstr.h | ||
| dix-config.h.in | ||
| dix.h | ||
| dixaccess.h | ||
| dixevents.h | ||
| dixfont.h | ||
| dixfontstr.h | ||
| dixgrabs.h | ||
| dixstruct.h | ||
| exevents.h | ||
| extension.h | ||
| extinit.h | ||
| extnsionst.h | ||
| gc.h | ||
| gcstruct.h | ||
| globals.h | ||
| hotplug.h | ||
| input.h | ||
| inputstr.h | ||
| kdrive-config.h.in | ||
| misc.h | ||
| miscstruct.h | ||
| opaque.h | ||
| os.h | ||
| pixmap.h | ||
| pixmapstr.h | ||
| privates.h | ||
| property.h | ||
| propertyst.h | ||
| region.h | ||
| regionstr.h | ||
| resource.h | ||
| rgb.h | ||
| screenint.h | ||
| scrnintstr.h | ||
| selection.h | ||
| servermd.h | ||
| site.h | ||
| swaprep.h | ||
| swapreq.h | ||
| validate.h | ||
| window.h | ||
| windowstr.h | ||
| xgl-config.h.in | ||
| xkb-config.h.in | ||
| xkbsrv.h | ||
| xorg-config.h.in | ||
| xorg-server.h.in | ||
| xwin-config.h.in | ||