xserver/xgl
Alan Hourihane bb4b196f98 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2
Conflicts:

	GL/glx/glxscreens.c
	hw/xfree86/Makefile.am
	hw/xgl/xglscreen.c
	mi/miinitext.c
2007-11-05 22:12:47 +00:00
..
Makefile.am Don't link XGL_LIBS in xgl 2007-09-28 16:56:42 +01:00
xgl.h Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2 2007-11-05 22:12:47 +00:00
xglarea.c Factor-out glucose symlinked code from xgl into a common library. 2007-09-26 16:43:56 +00:00
xglcmap.c Factor-out glucose symlinked code from xgl into a common library. 2007-09-26 16:43:56 +00:00
xglcompose.c Fix recent merge problems and add enter/leave wrapper 2007-10-19 11:46:01 +01:00
xglcopy.c Fix recent merge problems and add enter/leave wrapper 2007-10-19 11:46:01 +01:00
xglfill.c Factor-out glucose symlinked code from xgl into a common library. 2007-09-26 16:43:56 +00:00
xglgc.c Factor-out glucose symlinked code from xgl into a common library. 2007-09-26 16:43:56 +00:00
xglgeometry.c Factor-out glucose symlinked code from xgl into a common library. 2007-09-26 16:43:56 +00:00
xglget.c Fix recent merge problems and add enter/leave wrapper 2007-10-19 11:46:01 +01:00
xglglyph.c Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2 2007-11-05 22:12:47 +00:00
xglpict.c Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2 2007-11-05 22:12:47 +00:00
xglpixmap.c Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2 2007-11-05 22:12:47 +00:00
xglshm.c Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2 2007-11-05 22:12:47 +00:00
xglsolid.c Fix recent merge problems and add enter/leave wrapper 2007-10-19 11:46:01 +01:00
xglsync.c Missed a rename 2007-10-19 12:00:17 +01:00
xgltile.c Fix recent merge problems and add enter/leave wrapper 2007-10-19 11:46:01 +01:00
xgltrap.c Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2 2007-11-05 22:12:47 +00:00
xglwindow.c Factor-out glucose symlinked code from xgl into a common library. 2007-09-26 16:43:56 +00:00
xglxv.c Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2 2007-11-05 22:12:47 +00:00