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

afb

Merge branch 'master' into XACE-SELINUX

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

cfb

Merge branch 'master' into XACE-SELINUX

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

cfb32

get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE

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

composite

Revert "registry: Register composite extension protocol names."

2007-11-20 17:27:37 -05:00

config

Merge branch 'master' into XACE-SELINUX

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

damageext

Revert "registry: Register DAMAGE extension protocol names."

2007-11-20 17:31:00 -05:00

dbe

Revert "registry: Register DBE extension protocol names."

2007-11-20 17:32:35 -05:00

dix

Merge branch 'master' into XACE-SELINUX

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

doc

Merge branch 'master' into XACE-SELINUX

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

exa

Merge branch 'master' into XACE-SELINUX

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

fb

Merge branch 'master' into XACE-SELINUX

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

GL

Merge branch 'master' into XACE-SELINUX

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

hw

Merge branch 'master' into XACE-SELINUX

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

include

Merge branch 'master' into XACE-SELINUX

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

mfb

devPrivates rework: put back some changes that were mistakenly removed

2007-11-20 15:31:44 -05:00

mi

Merge branch 'master' into XACE-SELINUX

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

miext

Merge branch 'master' into XACE-SELINUX

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

os

Merge branch 'master' into XACE-SELINUX

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

randr

Revert "registry: Register RANDR extension protocol names."

2007-11-20 17:51:27 -05:00

record

Revert "registry: Register Record extension protocol names."

2007-11-20 17:55:47 -05:00

render

Merge branch 'master' into XACE-SELINUX

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

Xext

Merge branch 'master' into XACE-SELINUX

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

xfixes

Revert "registry: Register XFixes extension protocol names."

2007-11-20 18:44:56 -05:00

Xi

Merge branch 'master' into XACE-SELINUX

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

xkb

Merge branch 'master' into XACE-SELINUX

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

XTrap

Revert "registry: Register XTrap extension protocol names."

2007-11-20 18:49:30 -05:00

.gitignore

Merge branch 'master' into XACE-SELINUX

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

acinclude.m4

Include comment/copyright/license for AC_DEFINE_DIR in acinclude.m4

2007-07-25 17:42:23 -07:00

autogen.sh

Use canonical autogen.sh, which supports srcdir != objdir autogen.

2005-07-01 21:13:36 +00:00

configure.ac

Merge branch 'master' into XACE-SELINUX

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

COPYING

COPYING: Collapse 'canonical license' into one statement

2007-11-07 03:58:56 +02:00

cpprules.in

For MANDEFS, also replace __mandir__ for $(mandir) which includes

2006-12-08 15:51:44 -06:00

Makefile.am

Generate ChangeLog file for make dist.

2007-07-10 21:33:54 -07:00

xorg-server.m4

Add xorg-server.m4 for driver dependency checking.

2005-11-01 15:01:51 +00:00

xorg-server.pc.in

Export the server ABI versions from xorg-server.pc

2007-11-05 17:18:46 -05:00

Description

Truly free fork of the XOrg project.

91 MiB

Languages

C 96.4%

Roff 1.1%

Objective-C 1%

Meson 0.9%

Shell 0.2%

Other 0.2%