Peter Hutterer e8777a91f3 Merge branch 'master' into mpx ...

Conflicts:

	Xi/closedev.c
	Xi/exevents.c
	Xi/extinit.c
	Xi/listdev.c
	dix/window.c
	hw/xfree86/common/xf86Xinput.c
	include/extinit.h
	mi/mipointer.c

2007-04-02 15:36:26 +09:30

..

BT.c

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

BT.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

BTPriv.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

CURSOR.NOTES

Merging XORG-CURRENT into trunk

2004-04-23 19:54:30 +00:00

IBM.c

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

IBM.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

IBMPriv.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

Makefile.am

Create driver-independent CRTC-based cursor layer.

2007-03-15 00:02:40 -07:00

TI.c

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

TI.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

TIPriv.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

xf86Cursor.c

Merge branch 'master' into mpx

2007-03-05 12:37:17 +10:30

xf86Cursor.h

Create driver-independent CRTC-based cursor layer.

2007-03-15 00:02:40 -07:00

xf86CursorPriv.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

xf86HWCurs.c

Cleaning up ifdef MPX from remaining files, removing it from configure.ac.

2006-12-18 17:35:34 +10:30

xf86RamDac.c

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

xf86RamDac.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

xf86RamDacCmap.c

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

xf86RamDacPriv.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00