Eamon Walsh 97c150b61b Merge branch 'master' into XACE-SELINUX ...

Conflicts:

	afb/afbpntwin.c
	afb/afbscrinit.c
	afb/afbwindow.c
	cfb/cfb.h
	cfb/cfballpriv.c
	cfb/cfbscrinit.c
	cfb/cfbwindow.c
	configure.ac
	fb/wfbrename.h
	hw/xfree86/xf4bpp/ppcIO.c
	hw/xfree86/xf4bpp/ppcPntWin.c
	hw/xfree86/xf4bpp/ppcWindow.c
	hw/xfree86/xf8_32bpp/cfbscrinit.c
	mfb/mfb.h
	mfb/mfbpntwin.c
	mfb/mfbscrinit.c
	mfb/mfbwindow.c
	mi/miexpose.c

Note: conflicts caused by devPrivates rework vs. paintwindow changes.

2007-09-19 07:25:55 -04: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

devPrivates rework: since API is already broken, switch everything

2007-08-28 09:28:25 -04: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

Convert servers to using _DEPENDENCIES to ensure proper rebuilds.

2007-08-31 13:09:45 -07:00

Pixmap.c

devPrivates rework: since API is already broken, switch everything

2007-08-28 09:28:25 -04: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-09-19 07:25:55 -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

devPrivates rework: since API is already broken, switch everything

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

XNWindow.h

Merge branch 'master' into XACE-SELINUX

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