Merging XORG-CURRENT into trunk

2004-04-23 19:54:30 +00:00
parent 0664db19bf
commit 2fb5886200
1188 changed files with 20605 additions and 3549 deletions
--- a/fb/fbbits.h
+++ b/fb/fbbits.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/fb/fbbits.h,v 1.14 2003/11/03 05:11:00 tsi Exp $
+ * $XFree86$
 *
 * Copyright <20> 1998 Keith Packard
 *