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

Conflicts:

	hw/xgl/glx/Makefile.am
	hw/xgl/glxext/module/Makefile.am
2008-05-28 20:15:43 +01:00
..
dmx Merge branch 'master' into mpx 2008-05-26 17:37:31 +09:30
kdrive Merge branch 'master' into mpx 2008-05-26 17:37:31 +09:30
vfb Merge branch 'master' into mpx 2008-05-26 17:37:31 +09:30
xfree86 Merge branch 'master' of 2008-05-28 20:15:43 +01:00
xgl Merge branch 'master' of 2008-05-28 20:15:43 +01:00
xnest Merge branch 'master' into mpx 2008-05-26 17:37:31 +09:30
xquartz Merge branch 'master' into mpx 2008-05-26 17:37:31 +09:30
xwin Merge branch 'master' into mpx 2008-05-26 17:37:31 +09:30
Makefile.am X n'est pas une print API. 2008-05-12 14:15:11 -04:00