Peter Hutterer 1f97a76476 Merge branch 'master' into mpx ... Conflicts: dix/devices.c hw/xfree86/common/xf86Xinput.c hw/xfree86/loader/xf86sym.c mi/mieq.c		2007-06-19 17:20:52 +09:30
..
darwin	Split the xserver/fb/fbcmap.c file into two files.	2007-04-03 09:28:21 -06:00
dmx	fix __glXErrorCallBack() proto	2007-04-30 10:33:12 -06:00
kdrive	Merge branch 'master' into mpx	2007-06-19 17:20:52 +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-06-19 17:20:52 +09:30
xgl	Fix a couple of picture repeat fields incorrectly compared to RepeatNormal.	2007-04-29 23:38:13 +02:00
xnest	Merge branch 'master' into mpx	2007-06-19 17:20:52 +09:30
xprint	Update Xprint build for pixman.	2007-05-30 03:07:30 +10:00
xwin	Merge branch 'master' into mpx	2007-06-19 17:20:52 +09:30
Makefile.am	dix mods for Darwin	2007-02-17 01:21:43 -08:00