From 2fb588620030ad393f8500d60e16144d59e4effe Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 23 Apr 2004 19:54:30 +0000
Subject: Merging XORG-CURRENT into trunk

---
 fb/fbgc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'fb/fbgc.c')

diff --git a/fb/fbgc.c b/fb/fbgc.c
index 1e9eb5aa3..8cd08503d 100644
--- a/fb/fbgc.c
+++ b/fb/fbgc.c
@@ -21,7 +21,8 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: 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.15 2003/12/18 15:25:41 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.14 2003/12/18 15:22:32 alanh Exp $ */
 
 #include "fb.h"
 #ifdef IN_MODULE
-- 
cgit v1.2.3