xserver/os
Eamon Walsh 2d17f47cc7 Merge branch 'master' into XACE-SELINUX
Conflicts:

	hw/xnest/Pixmap.c
	include/dix.h
2007-11-19 18:10:46 -05:00
..
Makefile.am Merge branch 'master' into XACE-SELINUX 2007-11-19 18:10:46 -05:00
WaitFor.c
access.c
auth.c Merge branch 'master' into XACE-SELINUX 2007-11-19 18:10:46 -05:00
connection.c
io.c
log.c
mitauth.c
oscolor.c
oscolor.h
osdep.h
osinit.c
rpcauth.c
strlcat.c
strlcpy.c
utils.c Merge branch 'master' into XACE-SELINUX 2007-11-19 18:10:46 -05:00
xdmauth.c
xdmcp.c
xprintf.c
xstrans.c