merge XFree86 4.3.0.1 to -CURRENT

2003-11-17 19:03:47 +00:00
parent 9508a382f8
commit c57959ad6a
615 changed files with 42990 additions and 101132 deletions
--- a/dix/xpstubs.c
+++ b/dix/xpstubs.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/dix/xpstubs.c,v 1.4 2001/12/20 19:41:00 tsi Exp $ */
 /*
 Copyright 1996, 1998  The Open Group

@@ -43,7 +44,6 @@ XpClientIsPrintClient(client, fpe)
 {
    return FALSE;
 }
-
 int
 XprintOptions(argc, argv, i)
    int argc;