From 2d1d9f32e0abaee80cbbe8074de658aa60b4b46d Mon Sep 17 00:00:00 2001
From: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue, 30 Mar 2004 11:25:45 +0000
Subject: [PATCH] Merge with XORG-RELEASE-1-TM (44-46)

---
 hw/xfree86/getconfig/cfg.sample | 2 +-
 hw/xfree86/getconfig/getconfig  | 4 +---
 hw/xfree86/getconfig/xorg.cfg   | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/hw/xfree86/getconfig/cfg.sample b/hw/xfree86/getconfig/cfg.sample
index 93c98e4e2..8e26fd2e3 100644
--- a/hw/xfree86/getconfig/cfg.sample
+++ b/hw/xfree86/getconfig/cfg.sample
@@ -1,4 +1,4 @@
-# $DHD: xc/programs/Xserver/hw/xfree86/getconfig/cfg.sample,v 1.2 2003/09/23 05:12:07 dawes Exp $
+# $XdotOrg$
 
 # Some sample Xorg getconfig rules file.
 
diff --git a/hw/xfree86/getconfig/getconfig b/hw/xfree86/getconfig/getconfig
index d2acc9bb8..a9e2b3ef2 100644
--- a/hw/xfree86/getconfig/getconfig
+++ b/hw/xfree86/getconfig/getconfig
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $DHD: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.sh,v 1.2 2003/09/20 01:45:57 dawes Exp $
+# $XdotOrg$
 
 #
 # Copyright 2003 by David H. Dawes.
@@ -33,8 +33,6 @@
 # Author: David Dawes <dawes@XFree86.Org>.
 #
 
-# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.sh,v 1.1 2003/10/08 14:58:29 dawes Exp $
-
 # A simple wrapper to execute the real getconfig program.  So long as perl
 # is in $PATH, we don't need to know where it is this way.
 
diff --git a/hw/xfree86/getconfig/xorg.cfg b/hw/xfree86/getconfig/xorg.cfg
index 2b2d58afb..848d5eb90 100644
--- a/hw/xfree86/getconfig/xorg.cfg
+++ b/hw/xfree86/getconfig/xorg.cfg
@@ -1,4 +1,4 @@
-# $DHD: xc/programs/Xserver/hw/xfree86/getconfig/xfree86.cfg,v 1.4 2003/09/23 05:12:07 dawes Exp $
+# $XdotOrg$
 
 # Base Xorg getconfig rules file.