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,4 @@
/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */
/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */
/************************************************************
Copyright 1987, 1998 The Open Group