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/dix/globals.c,v 1.13 2003/12/03 17:11:29 tsi Exp $ */
/* $XdotOrg: xc/programs/Xserver/dix/globals.c,v 1.13 2003/12/03 17:11:29 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.12tsi Exp $ */
/************************************************************
Copyright 1987, 1998 The Open Group