Eamon Walsh b633d54b94 Merge branch 'master' into XACE-SELINUX ...

Conflicts:

	GL/glx/glxscreens.c
	hw/xnest/Screen.c
	render/glyph.c
	render/glyphstr.h
	render/render.c

2007-10-25 12:19:30 -04:00

..

cw

Merge branch 'master' into XACE-SELINUX

2007-10-25 12:19:30 -04:00

damage

Merge branch 'master' into XACE-SELINUX

2007-09-19 07:25:55 -04:00

rootless

Merge branch 'master' into XACE-SELINUX

2007-09-19 07:25:55 -04:00

shadow

devPrivates rework: since API is already broken, switch everything

2007-08-28 09:28:25 -04:00

Makefile.am

merged in miext/rootless changes for XDarwin support

2007-02-16 04:12:26 -08:00