Merging XORG-CURRENT into trunk

This commit is contained in:
Egbert Eich
2004-04-23 19:54:30 +00:00
parent 0664db19bf
commit 2fb5886200
1188 changed files with 20605 additions and 3549 deletions

View File

@@ -1,4 +1,5 @@
/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.4 2000/06/28 18:21:22 tsi Exp $ */
/* $XdotOrg$ */
/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.3 1999/09/25 14:38:21 dawes Exp $ */
#ifndef _XSERV_GLOBAL_H_
#define _XSERV_GLOBAL_H_