Ian Romanick e1f73d2208 Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework ...

Conflicts:

	hw/xfree86/common/xf86Configure.c
	hw/xfree86/common/xf86Helper.c
	hw/xfree86/common/xf86pciBus.c
	hw/xfree86/int10/helper_exec.c
	hw/xfree86/os-support/bus/Pci.c
	hw/xfree86/os-support/bus/linuxPci.c
	hw/xfree86/os-support/linux/lnx_pci.c
	hw/xfree86/scanpci/Makefile.am
	hw/xfree86/utils/pcitweak/Makefile.am
	hw/xfree86/utils/scanpci/Makefile.am

2006-12-08 17:24:15 -08:00

..

darwin

make core keyboard/pointer map functions act on all core-sending devices

2006-09-29 00:34:23 +03:00

dmx

Add $(DIX_CFLAGS) to remaining Makefile.am files

2006-11-07 12:49:28 -08:00

kdrive

kdrive/mga: fix compiler warning

2006-12-06 23:24:24 +02:00

vfb

Merge master back to randr-1.2

2006-11-04 17:46:26 -08:00

xfree86

Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework

2006-12-08 17:24:15 -08:00

xgl

Add $(DIX_CFLAGS) to remaining Makefile.am files

2006-11-07 12:49:28 -08:00

xnest

input: add non-keyboard bell ringing function

2006-11-01 23:10:26 +02:00

xprint

Convert Xprt DDX to new motion history api

2006-11-02 18:30:58 -08:00

xwin

Add $(DIX_CFLAGS) to remaining Makefile.am files

2006-11-07 12:49:28 -08:00

Makefile.am

Xprint/ -> hw/xprint

2006-06-18 21:07:28 -04:00