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

	configure.ac
	glx/glxcmds.c
	hw/xfree86/Makefile.am
	hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib
	hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib
2008-08-20 10:54:07 +01:00
..
dmx Add atKeynames.h in hw/dmx/input and drop evil cross-ddx #include. 2008-08-12 19:33:31 +01:00
kdrive Eviscerate save-under support. 2008-08-13 17:28:08 -04:00
vfb Unifdef AIX. 2008-07-23 13:37:42 -04:00
xfree86 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2 2008-08-20 10:54:07 +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 Shape extension is built-in and mandatory. 2008-07-24 15:46:08 -04:00
xquartz Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2 2008-08-20 10:54:07 +01:00
xwin Remove all empty extension reset hooks, replace with NULL. 2008-07-24 15:46:08 -04:00
Makefile.am Remove xgl. 2008-06-12 16:00:50 -04:00