Merging XORG-CURRENT into trunk

This commit is contained in:
Egbert Eich 2004-04-23 19:54:30 +00:00
commit 2fb5886200
1188 changed files with 20614 additions and 3558 deletions

View file

@ -29,7 +29,7 @@
* holders shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in this Software without prior written authorization.
*/
/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */
/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzCursor.h,v 1.2 2001/09/23 04:04:49 torrey Exp $ */
#ifndef QUARTZCURSOR_H
#define QUARTZCURSOR_H