xserver/hw/xgl
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
..
egl Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2 2008-06-13 15:39:43 +01:00
glx Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2 2008-06-13 15:39:43 +01:00
glxext Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2 2008-06-13 15:39:43 +01:00
Makefile.am Remove xgl. 2008-06-12 16:00:50 -04:00
xglglx.c Remove xgl. 2008-06-12 16:00:50 -04:00
xglglx.h Remove xgl. 2008-06-12 16:00:50 -04:00
xglinit.c Remove xgl. 2008-06-12 16:00:50 -04:00
xglinput.c Remove xgl. 2008-06-12 16:00:50 -04:00
xglparse.c Remove xgl. 2008-06-12 16:00:50 -04:00
xglscreen.c Remove xgl. 2008-06-12 16:00:50 -04:00