a52c9b2a59
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/dispatch.c
dix/property.c
hw/xfree86/common/xf86VidMode.c
include/xkbsrv.h
render/glyph.c
xkb/xkbActions.c
2007-11-05 19:08:36 -05:00
ff9929ed48
pulling in changes from xorg-server-1.2-apple branch
2007-11-04 05:13:19 -08:00
27612748e0
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/devices.c
2007-09-26 07:47:29 -04:00
c140d20f4a
XDarwin: mass change from using xorg-config.h to dix-config.h cuz we're not using the X.org ddx anymore
2007-09-19 05:58:22 -07:00
4017d31902
devPrivates rework: since API is already broken, switch everything
...
over to new system.
Need to update documentation and address some remaining vestiges of
old system such as CursorRec structure, fb "offman" structure, and
FontRec privates.
2007-08-28 09:28:25 -04:00
d287b76471
cleaned up some linking ugliness in hw/darwin/quartz
2007-02-17 03:47:42 -08:00
84efe23ae8
updated darwin/quartz/xpr (libXplugin interface for Mac OS X) support
2007-02-16 04:37:38 -08:00
0aaac95b0d
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
2fb5886200
Merging XORG-CURRENT into trunk
2004-04-23 19:54:30 +00:00
dae90c3af9
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
2004-03-14 08:34:49 +00:00
867451f1ab
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
2004-03-03 12:12:50 +00:00
df0313d35b
readding XFree86's cvs IDs
2004-02-26 13:36:15 +00:00
147aae87fd
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
2004-02-26 09:23:53 +00:00
90f1536dd3
Initial revision
2003-11-25 19:29:01 +00:00
Eamon Walsh
Ben Byer
Ben Byer
Ben Byer
Adam Jackson
Egbert Eich
Kaleb Keithley