38 files changed, 47 insertions, 47 deletions

diff --git a/fb/fb.h b/fb/fb.h
index ed73aac8e..dc88ae6de 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -1,7 +1,7 @@
 /*
  * $XFree86: xc/programs/Xserver/fb/fb.h,v 1.36tsi Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -22,7 +22,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $XdotOrg: xc/programs/Xserver/fb/fb.h,v 1.6 2004/08/11 21:14:17 kem Exp $ */
+/* $XdotOrg: xc/programs/Xserver/fb/fb.h,v 1.7 2004/11/05 19:51:38 torrey Exp $ */
 
 #ifndef _FB_H_
 #define _FB_H_
diff --git a/fb/fb24_32.c b/fb/fb24_32.c
index 08d681798..2bdad1f3a 100644
--- a/fb/fb24_32.c
+++ b/fb/fb24_32.c
@@ -1,7 +1,7 @@
 /*
  * $XFree86: xc/programs/Xserver/fb/fb24_32.c,v 1.4 2000/08/09 17:50:51 keithp Exp $
  *
- * Copyright © 2000 SuSE, Inc.
+ * Copyright © 2000 SuSE, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fb24_32.h b/fb/fb24_32.h
index 80034aa25..74e04a183 100644
--- a/fb/fb24_32.h
+++ b/fb/fb24_32.h
@@ -1,7 +1,7 @@
 /*
  * $XFree86$
  *
- * Copyright © 2000 SuSE, Inc.
+ * Copyright © 2000 SuSE, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fballpriv.c b/fb/fballpriv.c
index 29e98ae9f..59d76d333 100644
--- a/fb/fballpriv.c
+++ b/fb/fballpriv.c
@@ -1,7 +1,7 @@
 /*
  * Id: fballpriv.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbarc.c b/fb/fbarc.c
index bba95a84e..d7e0688b1 100644
--- a/fb/fbarc.c
+++ b/fb/fbarc.c
@@ -1,7 +1,7 @@
 /*
  * Id: fbarc.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbbits.c b/fb/fbbits.c
index 3cca2bbb2..a6bcd5b6a 100644
--- a/fb/fbbits.c
+++ b/fb/fbbits.c
@@ -1,7 +1,7 @@
 /*
  * Id: fbbits.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbbits.h b/fb/fbbits.h
index 4f9d04e62..69b254452 100644
--- a/fb/fbbits.h
+++ b/fb/fbbits.h
@@ -1,7 +1,7 @@
 /*
  * $XFree86$
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbblt.c b/fb/fbblt.c
index c6e29f387..b5daf1096 100644
--- a/fb/fbblt.c
+++ b/fb/fbblt.c
@@ -1,7 +1,7 @@
 /*
  * Id: fbblt.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbbltone.c b/fb/fbbltone.c
index 762022551..ca45207b5 100644
--- a/fb/fbbltone.c
+++ b/fb/fbbltone.c
@@ -1,7 +1,7 @@
 /*
  * Id: fbbltone.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbbstore.c b/fb/fbbstore.c
index 7b0863856..c74eaa240 100644
--- a/fb/fbbstore.c
+++ b/fb/fbbstore.c
@@ -1,7 +1,7 @@
 /*
  * Id: fbbstore.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbcompose.c b/fb/fbcompose.c
index e0be7b155..53872808f 100644
--- a/fb/fbcompose.c
+++ b/fb/fbcompose.c
@@ -1,8 +1,8 @@
 /*
- * $XdotOrg: xc/programs/Xserver/fb/fbcompose.c,v 1.2 2004/04/23 19:05:14 eich Exp $
+ * $XdotOrg: xc/programs/Xserver/fb/fbcompose.c,v 1.3 2004/05/12 01:49:46 anholt Exp $
  * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.17tsi Exp $
  *
- * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
+ * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbcopy.c b/fb/fbcopy.c
index 2f2d2f12b..940f11d73 100644
--- a/fb/fbcopy.c
+++ b/fb/fbcopy.c
@@ -1,7 +1,7 @@
 /*
  * Id: fbcopy.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbfill.c b/fb/fbfill.c
index f5842c252..3457f1f22 100644
--- a/fb/fbfill.c
+++ b/fb/fbfill.c
@@ -1,7 +1,7 @@
 /*
  * Id: fbfill.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbfillrect.c b/fb/fbfillrect.c
index c39b500fd..43b2e6b15 100644
--- a/fb/fbfillrect.c
+++ b/fb/fbfillrect.c
@@ -1,7 +1,7 @@
 /*
  * Id: fbfillrect.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbfillsp.c b/fb/fbfillsp.c
index dae05b0ed..e5e322d85 100644
--- a/fb/fbfillsp.c
+++ b/fb/fbfillsp.c
@@ -1,7 +1,7 @@
 /*
  * Id: fbfillsp.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbgc.c b/fb/fbgc.c
index 8cd08503d..29d6d491b 100644
--- a/fb/fbgc.c
+++ b/fb/fbgc.c
@@ -1,7 +1,7 @@
 /*
  * Id: fbgc.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XdotOrg: xc/programs/Xserver/fb/fbgc.c,v 1.15 2003/12/18 15:25:41 alanh Exp $ */
+/* $XdotOrg: xc/programs/Xserver/fb/fbgc.c,v 1.2 2004/04/23 19:05:14 eich Exp $ */
 /* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.14 2003/12/18 15:22:32 alanh Exp $ */
 
 #include "fb.h"
diff --git a/fb/fbgetsp.c b/fb/fbgetsp.c
index 3140377e5..de69be3cc 100644
--- a/fb/fbgetsp.c
+++ b/fb/fbgetsp.c
@@ -1,7 +1,7 @@
 /*
  * Id: fbgetsp.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbglyph.c b/fb/fbglyph.c
index b7eea5e77..348ea4931 100644
--- a/fb/fbglyph.c
+++ b/fb/fbglyph.c
@@ -1,8 +1,8 @@
 /*
- * $XdotOrg: xc/programs/Xserver/fb/fbglyph.c,v 1.13 2003/12/04 17:15:12 tsi Exp $
+ * $XdotOrg: xc/programs/Xserver/fb/fbglyph.c,v 1.2 2004/04/23 19:05:14 eich Exp $
  * $XFree86: xc/programs/Xserver/fb/fbglyph.c,v 1.12tsi Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbimage.c b/fb/fbimage.c
index 49356f627..171993a0a 100644
--- a/fb/fbimage.c
+++ b/fb/fbimage.c
@@ -1,7 +1,7 @@
 /*
  * Id: fbimage.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbline.c b/fb/fbline.c
index d48780100..ad684604f 100644
--- a/fb/fbline.c
+++ b/fb/fbline.c
@@ -1,7 +1,7 @@
 /*
  * $XFree86$
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbmmx.c b/fb/fbmmx.c
index 9adda92de..a33779b4a 100644
--- a/fb/fbmmx.c
+++ b/fb/fbmmx.c
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004 Red Hat, Inc.
+ * Copyright © 2004 Red Hat, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -18,7 +18,7 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * Author:  Søren Sandmann (sandmann@redhat.com)
+ * Author:  Søren Sandmann (sandmann@redhat.com)
  * 
  * Based on work by Owen Taylor
  */
diff --git a/fb/fbmmx.h b/fb/fbmmx.h
index dd8538cc4..a7f5fece3 100644
--- a/fb/fbmmx.h
+++ b/fb/fbmmx.h
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004 Red Hat, Inc.
+ * Copyright © 2004 Red Hat, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -18,7 +18,7 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * Author:  Søren Sandmann (sandmann@redhat.com)
+ * Author:  Søren Sandmann (sandmann@redhat.com)
  * 
  * Based on work by Owen Taylor
  */
diff --git a/fb/fboverlay.c b/fb/fboverlay.c
index 98bd5fc1c..35b930bdb 100644
--- a/fb/fboverlay.c
+++ b/fb/fboverlay.c
@@ -1,7 +1,7 @@
 /*
  * $XFree86: xc/programs/Xserver/fb/fboverlay.c,v 1.7 2003/11/10 18:21:47 tsi Exp $
  *
- * Copyright © 2000 SuSE, Inc.
+ * Copyright © 2000 SuSE, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -23,7 +23,7 @@
  * Author:  Keith Packard, SuSE, Inc.
  */
 
-/* $XdotOrg: xc/programs/Xserver/fb/fboverlay.c,v 1.3 2004/05/16 05:08:39 alanc Exp $ */
+/* $XdotOrg: xc/programs/Xserver/fb/fboverlay.c,v 1.4 2004/07/30 20:30:51 ajax Exp $ */
 
 #include "fb.h"
 #include "fboverlay.h"
diff --git a/fb/fboverlay.h b/fb/fboverlay.h
index aecb3856f..e6a4e033f 100644
--- a/fb/fboverlay.h
+++ b/fb/fboverlay.h
@@ -1,7 +1,7 @@
 /*
  * $XFree86: xc/programs/Xserver/fb/fboverlay.h,v 1.4tsi Exp $
  *
- * Copyright © 2000 SuSE, Inc.
+ * Copyright © 2000 SuSE, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbpict.c b/fb/fbpict.c
index ff638e5ce..3ca1feceb 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -1,7 +1,7 @@
 /*
  * $XFree86: xc/programs/Xserver/fb/fbpict.c,v 1.15 2002/09/26 02:56:48 keithp Exp $
  *
- * Copyright © 2000 SuSE, Inc.
+ * Copyright © 2000 SuSE, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbpict.h b/fb/fbpict.h
index 82f722c41..ccdc47dac 100644
--- a/fb/fbpict.h
+++ b/fb/fbpict.h
@@ -1,7 +1,7 @@
 /*
  * $XFree86: xc/programs/Xserver/fb/fbpict.h,v 1.7 2001/07/18 10:15:02 keithp Exp $
  *
- * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
+ * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c
index e3abf2b4c..482b30f57 100644
--- a/fb/fbpixmap.c
+++ b/fb/fbpixmap.c
@@ -1,7 +1,7 @@
 /*
  * Id: fbpixmap.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbpoint.c b/fb/fbpoint.c
index 255cfa05c..4bf345d93 100644
--- a/fb/fbpoint.c
+++ b/fb/fbpoint.c
@@ -1,7 +1,7 @@
 /*
  * Id: fbpoint.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbpush.c b/fb/fbpush.c
index ffb357ca3..09485cfbe 100644
--- a/fb/fbpush.c
+++ b/fb/fbpush.c
@@ -1,7 +1,7 @@
 /*
  * Id: fbpush.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbrop.h b/fb/fbrop.h
index 0b97be66f..65f62c393 100644
--- a/fb/fbrop.h
+++ b/fb/fbrop.h
@@ -1,7 +1,7 @@
 /*
  * Id: fbrop.h,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbscreen.c b/fb/fbscreen.c
index cd252a36a..82f2d5df0 100644
--- a/fb/fbscreen.c
+++ b/fb/fbscreen.c
@@ -1,7 +1,7 @@
-/* $XdotOrg: $
+/* $XdotOrg: xc/programs/Xserver/fb/fbscreen.c,v 1.3 2004/05/16 05:08:39 alanc Exp $
  * Id: fbscreen.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbseg.c b/fb/fbseg.c
index 993672b2c..71474bbd2 100644
--- a/fb/fbseg.c
+++ b/fb/fbseg.c
@@ -1,7 +1,7 @@
 /*
  * Id: fbseg.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbsetsp.c b/fb/fbsetsp.c
index ea9f3b581..9e6d1a08f 100644
--- a/fb/fbsetsp.c
+++ b/fb/fbsetsp.c
@@ -1,7 +1,7 @@
 /*
  * Id: fbsetsp.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbsolid.c b/fb/fbsolid.c
index 4b7ff1936..d727e4d01 100644
--- a/fb/fbsolid.c
+++ b/fb/fbsolid.c
@@ -1,7 +1,7 @@
 /*
  * $XFree86$
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbstipple.c b/fb/fbstipple.c
index 46278c1ac..7c9271590 100644
--- a/fb/fbstipple.c
+++ b/fb/fbstipple.c
@@ -1,7 +1,7 @@
 /*
  * Id: fbstipple.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbtile.c b/fb/fbtile.c
index 27cd42372..09bf97f1f 100644
--- a/fb/fbtile.c
+++ b/fb/fbtile.c
@@ -1,7 +1,7 @@
 /*
  * Id: fbtile.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbutil.c b/fb/fbutil.c
index 436bff72c..e35f0db03 100644
--- a/fb/fbutil.c
+++ b/fb/fbutil.c
@@ -1,7 +1,7 @@
 /*
  * Id: fbutil.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/fb/fbwindow.c b/fb/fbwindow.c
index afc7e510a..67cfb41d4 100644
--- a/fb/fbwindow.c
+++ b/fb/fbwindow.c
@@ -1,8 +1,8 @@
-/* $XdotOrg: xc/programs/Xserver/fb/fbwindow.c,v 1.3 2004/08/11 22:40:14 keithp Exp $ */
+/* $XdotOrg: xc/programs/Xserver/fb/fbwindow.c,v 1.4 2004/08/13 08:16:14 keithp Exp $ */
 /*
  * Id: fbwindow.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
- * Copyright © 1998 Keith Packard
+ * Copyright © 1998 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that