Peter Hutterer 8da83836b6 Merge branch 'master' into mpx ...

Conflicts:

	XTrap/xtrapddmi.c
	Xext/security.c
	Xext/xprint.c
	Xext/xtest.c
	Xext/xvdisp.c
	Xi/exevents.c
	Xi/grabdevb.c
	Xi/grabdevk.c
	Xi/opendev.c
	Xi/ungrdev.c
	Xi/ungrdevb.c
	Xi/ungrdevk.c
	dix/cursor.c
	dix/devices.c
	dix/dixutils.c
	dix/events.c
	dix/getevents.c
	dix/main.c
	dix/window.c
	hw/xfree86/ramdac/xf86Cursor.c
	include/dix.h
	include/input.h
	include/inputstr.h
	mi/midispcur.c
	mi/miinitext.c
	mi/misprite.c
	render/animcur.c
	xfixes/cursor.c
	xkb/xkbAccessX.c

2008-01-03 17:04:54 +10:30

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

Config: Don't forget to add xkb_rules option

2007-12-26 02:08:12 +01:00

damageext

Revert "registry: Register DAMAGE extension protocol names."

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

dbe

Clean up many #if 0.

2007-12-02 12:40:25 -05:00

dix

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

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 mpx

2008-01-03 17:04:54 +10:30

include

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

mfb

devPrivates rework: put back some changes that were mistakenly removed

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

mi

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

miext

Merge branch 'master' into XACE-SELINUX

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

os

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

randr

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

record

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

render

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

Xext

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

xfixes

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

Xi

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

xkb

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

XTrap

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

.gitignore

Merge branch 'master' into XACE-SELINUX

2007-12-14 00:32:24 -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

DeliverEventsToWindow: ensure that genericMask has a defined value.

2007-07-10 19:11:30 +09:30

configure.ac

damn then my cut-n-paste ate my end of lines...

2007-12-17 13:49:16 +10: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%