Peter Hutterer d7aef3f663 Merge branch 'master' into xi2 ...

Conflicts:
	Xext/geext.c
	Xi/chdevcur.c
	Xi/extgrbdev.c
	Xi/xiproperty.c
	configure.ac
	dix/ptrveloc.c
	hw/xfree86/common/xf86Config.c
	mi/mipointer.h
	test/input.c
	xkb/xkb.c

2009-05-28 17:20:58 +10:00

..

dmx

dix: remove all but main() from main.c

2009-04-28 16:03:56 +10:00

kdrive

kdrive: set Activate/Deactivate grab for input devices (#21591)

2009-05-16 12:20:58 +10:00

vfb

Fix most remaining deprecated resource lookups.

2009-04-29 01:04:37 -04:00

xfree86

Merge branch 'master' into xi2

2009-05-28 17:20:58 +10:00

xnest

Fix most remaining deprecated resource lookups.

2009-04-29 01:04:37 -04:00

xquartz

XQuartz: More localization updates

2009-05-27 10:16:11 -07:00

xwin

Cygwin/X: Update icons directly, rather than modifying the window's class

2009-05-27 14:14:32 +01:00

Makefile.am

Remove xgl.

2008-06-12 16:00:50 -04:00