Eamon Walsh c8feb73f58 Merge branch 'master' into XACE-SELINUX ...

Conflicts:

	Xext/EVI.c
	Xext/bigreq.c
	Xext/cup.c
	Xext/dpms.c
	Xext/fontcache.c
	Xext/mitmisc.c
	Xext/xcmisc.c
	Xext/xf86bigfont.c
	Xext/xtest.c
	configure.ac
	dbe/dbe.c
	hw/darwin/darwin.h
	hw/darwin/darwinEvents.c
	hw/darwin/iokit/xfIOKit.h
	hw/darwin/iokit/xfIOKitCursor.c
	hw/darwin/quartz/fullscreen/fullscreen.c
	hw/darwin/quartz/fullscreen/quartzCursor.c
	hw/darwin/quartz/quartz.c
	hw/darwin/quartz/quartzCommon.h
	hw/darwin/quartz/quartzCursor.c
	hw/darwin/quartz/xpr/dri.c
	hw/darwin/quartz/xpr/dristruct.h
	hw/darwin/quartz/xpr/xprCursor.c
	hw/darwin/quartz/xpr/xprFrame.c
	hw/xfree86/modes/xf86RandR12.c
	include/cursor.h
	miext/rootless/rootlessCommon.h
	miext/rootless/rootlessScreen.c
	miext/rootless/rootlessWindow.c
	render/picturestr.h

Trying to pick up the pieces from the darwin churn here...

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

..

.gitignore

Add some missing .gitignore stuff for Mesa symlinks and other generated files.

2006-06-18 19:47:51 -07:00

Args.c

Death to RCS tags.

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

Args.h

Death to RCS tags.

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

Color.c

Death to RCS tags.

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

Color.h

Death to RCS tags.

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

Cursor.c

devPrivates rework: convert CursorRec and CursorBits over to new interface.

2007-08-30 11:40:39 -04:00

Display.c

Bug #10560: Code-Cleanup: function declarations () -> (void)

2007-04-09 14:33:15 -07:00

Display.h

Remove RCS tags. Fix Xprint makefile braindamage.

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

Drawable.h

Death to RCS tags.

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

Events.c

Bug #10560: Code-Cleanup: function declarations () -> (void)

2007-04-09 14:33:15 -07:00

Events.h

Death to RCS tags.

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

Font.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

GC.c

devPrivates rework: since API is already broken, switch everything

2007-08-28 09:28:25 -04:00

GCOps.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

GCOps.h

Death to RCS tags.

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

Handlers.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

Handlers.h

Death to RCS tags.

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

icon

R6.6 is the Xorg base-line

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

Init.c

Merge branch 'master' into XACE-SELINUX

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

Init.h

Remove RCS tags. Fix Xprint makefile braindamage.

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

Keyboard.c

Static markup and dead code cull over xkb/.

2007-03-20 18:37:02 -04:00

Keyboard.h

Death to RCS tags.

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

Makefile.am

Xnest: fix lib dependancy to make libtool happy

2007-11-07 18:43:16 +01:00

Pixmap.c

Merge branch 'master' into XACE-SELINUX

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

Pointer.c

Death to RCS tags.

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

Pointer.h

Death to RCS tags.

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

Screen.c

Merge branch 'master' into XACE-SELINUX

2007-10-25 12:19:30 -04:00

Screen.h

Death to RCS tags.

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

screensaver

R6.6 is the Xorg base-line

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

Visual.c

Death to RCS tags.

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

Visual.h

Death to RCS tags.

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

Window.c

Merge branch 'master' into XACE-SELINUX

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

XNCursor.h

devPrivates rework: convert CursorRec and CursorBits over to new interface.

2007-08-30 11:40:39 -04:00

xnest-config.h

get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE

2006-07-18 18:17:38 -04:00

Xnest.h

Death to RCS tags.

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

Xnest.man.pre

Fix up xnest manpage

2007-05-28 21:39:12 -04:00

XNFont.h

Death to RCS tags.

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

XNGC.h

devPrivates rework: since API is already broken, switch everything

2007-08-28 09:28:25 -04:00

XNPixmap.h

Merge branch 'master' into XACE-SELINUX

2007-11-05 19:08:36 -05:00

XNWindow.h

Merge branch 'master' into XACE-SELINUX

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