Peter Hutterer 99d28c3ef3 Merge branch 'master' into mpx ...

Conflicts:

	Xext/xprint.c (removed in master)
	config/hal.c
	dix/main.c
	hw/kdrive/ati/ati_cursor.c (removed in master)
	hw/kdrive/i810/i810_cursor.c (removed in master)
	hw/xprint/ddxInit.c (removed in master)
	xkb/ddxLoad.c

2008-05-20 10:20:14 +09:30

afb

Merge branch 'master' into XACE-SELINUX

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

composite

Prevent the -wm command line option from causing a SEGV

2008-05-12 03:03:13 -04:00

config

Fix hal shutdown crash.

2008-05-16 09:49:20 -04: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 mpx

2008-05-20 10:20:14 +09:30

doc

Merge branch 'master' into XACE-SELINUX

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

exa

EXA: Fall back in CompositeRects if the driver can't accelerate Composite.

2008-05-01 15:10:52 +02:00

fb

Removed fbpseudocolor.h from sdk_HEADERS.

2008-04-19 12:54:40 +02:00

GL

Revert "GL: Make errors non-fatal"

2008-05-09 00:26:16 +03:00

hw

Merge branch 'master' into mpx

2008-05-20 10:20:14 +09:30

include

Merge branch 'master' into mpx

2008-05-20 10:20:14 +09: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-05-20 10:20:14 +09:30

miext

Rootless: mi doesn't let us resize root, so we need to do it ourselves...

2008-05-05 15:34:10 -07:00

os

Merge branch 'master' into mpx

2008-05-20 10:20:14 +09:30

randr

Merge branch 'master' into dcdc_rework

2008-04-07 07:56:41 +09:30

record

Merge branch 'master' into mpx

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

render

Merge branch 'master' into mpx

2008-05-20 10:20:14 +09:30

Xext

Merge branch 'master' into mpx

2008-05-20 10:20:14 +09:30

xfixes

Merge branch 'master' into mpx

2008-03-04 18:11:10 +10:30

Xi

Xi: assemble button/modifier state before updating the device. #15934

2008-05-16 15:42:57 +09:30

xkb

Merge branch 'master' into mpx

2008-05-20 10:20:14 +09:30

XTrap

Merge branch 'master' into mpx

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

.gitignore

XQuartz: Starting to work on the new Mach IPC startup stuff for better launchd, ApplicationServices, and Dock support

2008-05-12 10:42:12 -07:00

acinclude.m4

Update ac_define_dir macro in acinclude.m4 to 2008-04-12 version

2008-04-16 18:38:38 -07:00

autogen.sh

DeliverEventsToWindow: ensure that genericMask has a defined value.

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

configure.ac

Merge branch 'master' into mpx

2008-05-20 10:20:14 +09:30

COPYING

Standardise copyright headers for all new files created as part of MPX.

2008-04-25 14:50:24 +09:30

cpprules.in

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

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

Makefile.am

So long, and thanks for all the cfb.

2008-04-11 09:47:51 -04:00

xorg-server.m4

Add xorg-server.m4 for driver dependency checking.

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

xorg-server.pc.in

Include pciaccess in the xorg-server.pc Requires line.

2008-04-15 14:51:51 -07:00

Description

Truly free fork of the XOrg project.

95 MiB

Languages

C 96.4%

Roff 1.1%

Objective-C 1%

Meson 0.9%

Shell 0.2%

Other 0.2%