Peter Hutterer 0b729051c0 Merge branch 'master' into mpx ... Conflicts: Xi/extinit.c Xi/grabdev.c Xi/setmode.c Xi/ungrdev.c dix/devices.c dix/events.c dix/getevents.c include/dix.h mi/midispcur.c mi/misprite.c xkb/xkbActions.c xkb/xkbEvents.c xkb/xkbPrKeyEv.c		2007-11-07 15:37:23 +10:30
..
int10	Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework	2007-08-23 18:19:17 -07:00
lnx_acpi.c	Only issue XF86_APM_CAPABILITY_CHANGED for video change ACPI events (not e.g. brightness etc.).	2007-10-19 17:28:15 +02:00
lnx_agp.c	dix: Remove InitSprite, work can be done by InitializeSprite.	2007-03-01 17:19:37 +10:30
lnx_apm.c	Remove RCS tags. Fix Xprint makefile braindamage.	2006-07-21 17:56:00 -04:00
lnx_axp.c	Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework	2007-08-23 18:19:17 -07:00
lnx_bell.c	Convert all my license statements to the standard form	2007-08-01 01:53:31 +03:00
lnx_ev56.c	lnx_ev56.c has to be built with -mcpu=ev56. Fix it.	2007-01-10 16:04:20 +00:00
lnx_font.c	Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.	2005-07-03 07:02:09 +00:00
lnx_ia64.c	typo fix	2005-08-30 19:35:06 +00:00
lnx_init.c	Death to RCS tags.	2007-06-29 14:06:52 -04:00
lnx_jstk.c	Death to RCS tags.	2007-06-29 14:06:52 -04:00
lnx_kmod.c	Remove RCS tags. Fix Xprint makefile braindamage.	2006-07-21 17:56:00 -04:00
lnx_mouse.c	Avoid PS/2 protocol probing for /dev/input/mice	2007-11-02 12:04:56 -04:00
lnx_pci.c	Remove dead xf86GetPciSizeFromOS and xf86GetPciOffsetFromOS.	2007-08-30 11:26:17 -07:00
lnx_video.c	Fix an error message to not point to @xfree86.org.	2007-08-21 10:44:37 -04:00
lnx.h	Fix alpha build failures	2007-07-19 20:37:26 -04:00
lnxResource.c	Remove the now-dead PciAvoid symbol.	2007-08-30 11:26:17 -07:00
Makefile.am	xfree86: Fix build on Linux/alpha.	2007-08-21 00:26:33 +02:00