xserver/os
Peter Hutterer 1f97a76476 Merge branch 'master' into mpx
Conflicts:

	dix/devices.c
	hw/xfree86/common/xf86Xinput.c
	hw/xfree86/loader/xf86sym.c
	mi/mieq.c
2007-06-19 17:20:52 +09:30
..
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
secauth.c
strlcat.c
strlcpy.c
utils.c
xalloc.c
xdmauth.c
xdmcp.c
xprintf.c
xstrans.c