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/hw/xnest/Font.c
+++ b/hw/xnest/Font.c
@@ -12,6 +12,8 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.

 */
+/* $XFree86: xc/programs/Xserver/hw/xnest/Font.c,v 3.5 2001/01/17 22:36:55 dawes Exp $ */
+
 #include "X.h"
 #include "Xatom.h"
 #include "Xproto.h"