Merging XORG-CURRENT into trunk

This commit is contained in:
Egbert Eich
2004-04-23 18:54:16 +00:00
parent 9d24a5fa91
commit 0664db19bf
265 changed files with 1251 additions and 313 deletions

View File

@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
/* $XFree86: xc/programs/Xserver/Xi/getfocus.c,v 3.3 2001/12/14 19:58:56 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/getfocus.c,v 3.2 2001/01/17 22:13:24 dawes Exp $ */
/***********************************************************************
*