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

Conflicts:

	Xext/appgroup.c

2006-06-21 16:23:31 -07:00

..

atom.c

Mark everything in dixsym.c as _X_EXPORT.

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

buildatoms

XFree86 4.3.0.1

2003-11-14 16:49:22 +00:00

BuiltInAtoms

R6.6 is the Xorg base-line

2003-11-14 15:54:54 +00:00

CHANGES

R6.6 is the Xorg base-line

2003-11-14 15:54:54 +00:00

colormap.c

Kill LBX, too.

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

cursor.c

Mark everything in dixsym.c as _X_EXPORT.

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

devices.c

Move Xserver API for security extension to securitysrv.h

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

dispatch.c

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

2006-06-21 16:23:31 -07:00

dispatch.h

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

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

dixfonts.c

Kill LBX, too.

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

dixutils.c

Move Xserver API for security extension to securitysrv.h

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

events.c

Move Xserver API for security extension to securitysrv.h

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

extension.c

Move Xserver API for security extension to securitysrv.h

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

ffs.c

R6.6 is the Xorg base-line

2003-11-14 15:54:54 +00:00

gc.c

Mark everything in dixsym.c as _X_EXPORT.

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

globals.c

Put the screensaver extension back in the Xext module.

2006-04-05 21:08:45 +00:00

glyphcurs.c

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

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

grabs.c

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

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

initatoms.c

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

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

main.c

Refactored the screensaver and DPMS timer code to use the screensaver timer

2006-03-24 20:50:13 +00:00

Makefile.am

Define XFree86Server only where it is required.

2005-12-02 06:02:45 +00:00

pixmap.c

Bug #6924: Restore the ABI for DrawableRec and ColormapRec to the state

2006-05-22 15:47:56 +00:00

privates.c

Mark everything in dixsym.c as _X_EXPORT.

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

property.c

Move Xserver API for security extension to securitysrv.h

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

resource.c

Replace XC-SECURITY code with XACE security hooks

2006-06-19 17:09:37 -07:00

swaprep.c

Kill LBX, too.

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

swapreq.c

Mark everything in dixsym.c as _X_EXPORT.

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

tables.c

Mark everything in dixsym.c as _X_EXPORT.

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

window.c

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

2006-06-21 16:23:31 -07:00

xpstubs.c

fix compiler warning in dix/xpstubs.c when XPRINT is not defined

2006-06-21 14:16:28 -07:00