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

30 KiB

Raw Blame History

View Raw