Peter Hutterer d4dad6f84f Merge branch 'master' into mpx ...

Conflicts:

	configure.ac
	dix/events.c
	hw/xfree86/common/xf86Xinput.c

2007-04-12 11:11:03 +09:30

..

darwin

Split the xserver/fb/fbcmap.c file into two files.

2007-04-03 09:28:21 -06:00

dmx

Implement a minor hack in dmxCheckFunctionKeys() to detect special keys.

2007-04-03 11:21:50 -06:00

kdrive

Merge branch 'master' into mpx

2007-04-12 11:11:03 +09:30

vfb

Split the xserver/fb/fbcmap.c file into two files.

2007-04-03 09:28:21 -06:00

xfree86

Merge branch 'master' into mpx

2007-04-12 11:11:03 +09:30

xgl

Static markup and dead code cull over xkb/.

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

xnest

Merge branch 'master' into mpx

2007-04-12 11:11:03 +09:30

xprint

add DDXRingBell() stub to solve link problem

2007-04-03 09:30:24 -06:00

xwin

Static markup and dead code cull over xkb/.

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

Makefile.am

dix mods for Darwin

2007-02-17 01:21:43 -08:00