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_ops.c

Death to RCS tags.

2007-06-29 14:06:52 -04:00

cw_render.c

Replace calls to Glyphs screen hook with CompositeGlyphs and remove dead code.

2007-10-19 16:34:54 -07:00

cw.c

Merge branch 'master' into XACE-SELINUX

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

cw.h

Merge branch 'master' into XACE-SELINUX

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

Makefile.am

get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE

2006-07-18 18:17:38 -04:00