xserver/GL/glx
Eamon Walsh c8feb73f58 Merge branch 'master' into XACE-SELINUX
Conflicts:

	Xext/EVI.c
	Xext/bigreq.c
	Xext/cup.c
	Xext/dpms.c
	Xext/fontcache.c
	Xext/mitmisc.c
	Xext/xcmisc.c
	Xext/xf86bigfont.c
	Xext/xtest.c
	configure.ac
	dbe/dbe.c
	hw/darwin/darwin.h
	hw/darwin/darwinEvents.c
	hw/darwin/iokit/xfIOKit.h
	hw/darwin/iokit/xfIOKitCursor.c
	hw/darwin/quartz/fullscreen/fullscreen.c
	hw/darwin/quartz/fullscreen/quartzCursor.c
	hw/darwin/quartz/quartz.c
	hw/darwin/quartz/quartzCommon.h
	hw/darwin/quartz/quartzCursor.c
	hw/darwin/quartz/xpr/dri.c
	hw/darwin/quartz/xpr/dristruct.h
	hw/darwin/quartz/xpr/xprCursor.c
	hw/darwin/quartz/xpr/xprFrame.c
	hw/xfree86/modes/xf86RandR12.c
	include/cursor.h
	miext/rootless/rootlessCommon.h
	miext/rootless/rootlessScreen.c
	miext/rootless/rootlessWindow.c
	render/picturestr.h

Trying to pick up the pieces from the darwin churn here...
2007-12-13 18:38:25 -05:00
..
.gitignore
Makefile.am
extension_string.c
extension_string.h
g_disptab.h
glxbyteorder.h
glxcmds.c
glxcmdsswap.c
glxcontext.h
glxdrawable.h
glxdri.c
glxext.c
glxext.h
glxglcore.c
glxscreens.c
glxscreens.h
glxserver.h
glxutil.c
glxutil.h
indirect_dispatch.c
indirect_dispatch.h
indirect_dispatch_swap.c
indirect_program.c Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2007-01-04 15:01:38 -08:00
indirect_reqsize.c
indirect_reqsize.h
indirect_size_get.c
indirect_size_get.h
indirect_table.c
indirect_table.h
indirect_texture_compression.c
indirect_util.c
indirect_util.h
render2.c
render2swap.c
renderpix.c
renderpixswap.c
rensize.c
single2.c
single2swap.c
singlepix.c
singlepixswap.c
singlesize.c
singlesize.h
swap_interval.c
unpack.h
xfont.c