Alan Coopersmith a46c06dab8 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver ...

Conflicts:

	Xext/appgroup.c
	Xext/security.c
	dix/devices.c
	dix/dispatch.c
	dix/dixutils.c
	dix/events.c
	dix/extension.c
	dix/property.c
	dix/window.c
	os/access.c

2006-06-20 18:40:18 -07:00

..

access.c

Move Xserver API for security extension to securitysrv.h

2006-06-20 18:22:51 -07:00

auth.c

Move Xserver API for security extension to securitysrv.h

2006-06-20 18:22:51 -07:00

connection.c

Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver

2006-06-20 18:40:18 -07:00

io.c

Kill LBX, too.

2006-06-01 22:06:41 +00:00

k5auth.c

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

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

log.c

Mark everything in dixsym.c as _X_EXPORT.

2006-02-15 20:44:13 +00:00

Makefile.am

Kill LBX, too.

2006-06-01 22:06:41 +00:00

mitauth.c

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

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

oscolor.c

Make more extensions optional in build (for kdrive). Fix kdrive build for

2006-02-16 07:17:31 +00:00

oscolor.h

Add oscolor.h

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

osdep.h

Kill LBX, too.

2006-06-01 22:06:41 +00:00

osinit.c

Move call to xf86WrapperInit() to OsVendorInit() in xf86Init.c and remove

2006-02-13 04:43:40 +00:00

rpcauth.c

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

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

secauth.c

Move Xserver API for security extension to securitysrv.h

2006-06-20 18:22:51 -07:00

strlcat.c

Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.

2005-07-03 07:02:09 +00:00

strlcpy.c

Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.

2005-07-03 07:02:09 +00:00

utils.c

Move Xserver API for security extension to securitysrv.h

2006-06-20 18:22:51 -07:00

WaitFor.c

Die XTESTEXT1, die!

2006-06-01 18:47:47 +00:00

xalloc.c

Mark everything in dixsym.c as _X_EXPORT.

2006-02-15 20:44:13 +00:00

xdmauth.c

Coverity #82: Dead variable elimination.

2006-04-03 02:12:11 +00:00

xdmcp.c

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

2005-07-03 08:53:54 +00: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