Eamon Walsh
c8feb73f58
Merge branch 'master' into XACE-SELINUX
Conflicts:
Xext/EVI.c
Xext/bigreq.c
Xext/cup.c
Xext/dpms.c
Xext/fontcache.c
Xext/mitmisc.c
Xext/xcmisc.c
Xext/xf86bigfont.c
Xext/xtest.c
configure.ac
dbe/dbe.c
hw/darwin/darwin.h
hw/darwin/darwinEvents.c
hw/darwin/iokit/xfIOKit.h
hw/darwin/iokit/xfIOKitCursor.c
hw/darwin/quartz/fullscreen/fullscreen.c
hw/darwin/quartz/fullscreen/quartzCursor.c
hw/darwin/quartz/quartz.c
hw/darwin/quartz/quartzCommon.h
hw/darwin/quartz/quartzCursor.c
hw/darwin/quartz/xpr/dri.c
hw/darwin/quartz/xpr/dristruct.h
hw/darwin/quartz/xpr/xprCursor.c
hw/darwin/quartz/xpr/xprFrame.c
hw/xfree86/modes/xf86RandR12.c
include/cursor.h
miext/rootless/rootlessCommon.h
miext/rootless/rootlessScreen.c
miext/rootless/rootlessWindow.c
render/picturestr.h
Trying to pick up the pieces from the darwin churn here...
2007-12-13 18:38:25 -05:00
..
2006-07-21 17:56:00 -04:00
2006-06-29 16:25:36 -07:00
2007-12-03 14:12:58 -05:00
2005-05-21 07:46:38 +00:00
2004-04-23 19:54:30 +00:00
2004-09-22 17:20:56 +00:00
2006-07-21 17:56:00 -04:00
2007-02-28 17:40:58 -08:00
2006-11-30 20:13:52 -08:00
2007-12-03 14:52:46 -08:00
2007-11-20 18:31:07 -08:00
2004-06-16 09:22:17 +00:00
2007-08-28 09:28:25 -04:00
2007-11-20 18:31:07 -08:00