Peter Hutterer 8da83836b6 Merge branch 'master' into mpx ...

Conflicts:

	XTrap/xtrapddmi.c
	Xext/security.c
	Xext/xprint.c
	Xext/xtest.c
	Xext/xvdisp.c
	Xi/exevents.c
	Xi/grabdevb.c
	Xi/grabdevk.c
	Xi/opendev.c
	Xi/ungrdev.c
	Xi/ungrdevb.c
	Xi/ungrdevk.c
	dix/cursor.c
	dix/devices.c
	dix/dixutils.c
	dix/events.c
	dix/getevents.c
	dix/main.c
	dix/window.c
	hw/xfree86/ramdac/xf86Cursor.c
	include/dix.h
	include/input.h
	include/inputstr.h
	mi/midispcur.c
	mi/miinitext.c
	mi/misprite.c
	render/animcur.c
	xfixes/cursor.c
	xkb/xkbAccessX.c

2008-01-03 17:04:54 +10:30

..

access.c

Merge branch 'master' into XACE-SELINUX

2007-10-17 15:00:54 -04:00

auth.c

Merge branch 'master' into XACE-SELINUX

2007-11-19 18:10:46 -05:00

connection.c

Merge branch 'master' into XACE-SELINUX

2007-12-13 18:38:25 -05:00

io.c

Clean up many #if 0.

2007-12-02 12:40:25 -05:00

log.c

Remove the remnants of OS/2 support.

2007-06-28 18:59:05 -04:00

Makefile.am

Merge branch 'master' into XACE-SELINUX

2007-12-13 18:38:25 -05:00

mitauth.c

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

oscolor.c

Remove all traces of external RGB database (and Speedo)

2007-11-05 16:28:35 +00:00

oscolor.h

Add oscolor.h

2006-02-16 19:36:39 +00:00

osdep.h

Merge branch 'master' into XACE-SELINUX

2007-09-19 07:25:55 -04:00

osinit.c

Clean up many #if 0.

2007-12-02 12:40:25 -05:00

rpcauth.c

Actually build Secure RPC authentication support (missed in modularization)

2007-08-17 15:29:47 -07:00

strlcat.c

Death to RCS tags.

2007-06-29 14:06:52 -04:00

strlcpy.c

Death to RCS tags.

2007-06-29 14:06:52 -04:00

utils.c

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

WaitFor.c

Merge branch 'master' into XACE-SELINUX

2007-12-13 18:38:25 -05:00

xdmauth.c

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

xdmcp.c

General DIX static and dead code cleanup.

2007-03-25 17:57:54 -04:00

xprintf.c

Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h".

2005-07-03 08:53:54 +00:00

xstrans.c

Change HAVE_CONFIG_H to HAVE_DIX_CONFIG_H.

2005-07-03 12:16:29 +00:00