Alan Hourihane 946549401c Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2 ... Conflicts: configure.ac hw/xgl/Makefile.am hw/xgl/egl/xeglinit.c hw/xgl/glx/Makefile.am hw/xgl/glx/module/Makefile.am hw/xgl/glx/xglx.c hw/xgl/glx/xglxinit.c hw/xgl/glxext/Makefile.am hw/xgl/glxext/module/Makefile.am hw/xgl/glxext/xglglxext.c hw/xgl/glxext/xglglxlog.c hw/xgl/xglglx.c hw/xgl/xglglx.h hw/xgl/xglinit.c hw/xgl/xglinput.c hw/xgl/xglparse.c hw/xgl/xglscreen.c include/xgl-config.h.in		2008-06-13 15:39:43 +01:00
..
dmx	dmx: remove a ifndef XINPUT, XINPUT is always defined now.	2008-06-05 16:14:29 +09:30
kdrive	kdrive: fix wrong use of &, should be | instead.	2008-06-11 17:32:59 +09:30
vfb	Merge branch 'master' into mpx	2008-05-26 17:37:31 +09:30
xfree86	Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2	2008-06-13 15:39:43 +01:00
xgl	Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2	2008-06-13 15:39:43 +01:00
xnest	xnest: wrap the xnest cursor sprite funcs around the mi funcs.	2008-06-11 17:24:19 +09:30
xquartz	XQuartz: Under the new startup model, we no longer need to do the foreground/background dance.	2008-06-10 10:52:04 -07:00
xwin	Merge branch 'master' into mpx	2008-05-26 17:37:31 +09:30
Makefile.am	Remove xgl.	2008-06-12 16:00:50 -04:00