Alan Coopersmith a46c06dab8 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver ...

Conflicts:

	Xext/appgroup.c
	Xext/security.c
	dix/devices.c
	dix/dispatch.c
	dix/dixutils.c
	dix/events.c
	dix/extension.c
	dix/property.c
	dix/window.c
	os/access.c

2006-06-20 18:40:18 -07:00

..

darwin

Bug #5300: Fix missing spaces in the Build OS line in the log. (Egmont

2006-04-04 14:17:04 +00:00

dmx

Fix compiler warning about undefined ReinitializeRootWindow function

2006-06-07 14:12:40 -07:00

kdrive

Die XTESTEXT1, die!

2006-06-01 18:47:47 +00:00

vfb

fix compiler warning in hw/vfb/InitOutput.c

2006-06-19 11:50:47 -07:00

xfree86

Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver

2006-06-20 15:29:55 -07:00

xgl

Remove -xkbmap argument.

2006-05-29 11:14:03 +00:00

xnest

Add some missing .gitignore stuff for Mesa symlinks and other generated files.

2006-06-18 19:47:51 -07:00

xprint

Xprint/ -> hw/xprint

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

xwin

Move Xserver API for security extension to securitysrv.h

2006-06-20 18:22:51 -07:00

Makefile.am

Xprint/ -> hw/xprint

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