2d17f47cc7
Conflicts: hw/xnest/Pixmap.c include/dix.h |
||
|---|---|---|
| .. | ||
| Makefile.am | ||
| WaitFor.c | ||
| access.c | ||
| auth.c | ||
| connection.c | ||
| io.c | ||
| log.c | ||
| mitauth.c | ||
| oscolor.c | ||
| oscolor.h | ||
| osdep.h | ||
| osinit.c | ||
| rpcauth.c | ||
| strlcat.c | ||
| strlcpy.c | ||
| utils.c | ||
| xdmauth.c | ||
| xdmcp.c | ||
| xprintf.c | ||
| xstrans.c | ||