Eric Anholt b4b0d901d9 Merge branch 'randr-1.2' ...

Conflicts:

	dix/events.c
	dix/getevents.c
	hw/xfree86/common/xf86Mode.c
	hw/xfree86/dri/Makefile.am
	hw/xfree86/os-support/drm/xf86drm.c
	hw/xfree86/os-support/xf86drm.h

2006-11-27 15:43:15 -08:00

11 KiB

Raw Blame History

View Raw