diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-07-21 19:05:41 -0400 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-07-21 19:05:41 -0400 |
| commit | 7465010d59ec435bd00b738f0cef766b352dc7eb (patch) | |
| tree | b87bf4909a05e86ab8899b798ff853f20e64630c /hw/xfree86/utils/xorgconfig | |
| parent | 1d31ed778284082e1060bff63317c94581d9eb9b (diff) | |
| parent | 0aaac95b0d12089b256c97f6ff955c8c229ae095 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
Diffstat (limited to 'hw/xfree86/utils/xorgconfig')
| -rw-r--r-- | hw/xfree86/utils/xorgconfig/cards.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/utils/xorgconfig/cards.h | 1 | ||||
| -rw-r--r-- | hw/xfree86/utils/xorgconfig/xorgconfig.c | 2 |
3 files changed, 0 insertions, 5 deletions
diff --git a/hw/xfree86/utils/xorgconfig/cards.c b/hw/xfree86/utils/xorgconfig/cards.c index b5f23a00f..f903d7f9c 100644 --- a/hw/xfree86/utils/xorgconfig/cards.c +++ b/hw/xfree86/utils/xorgconfig/cards.c @@ -1,11 +1,9 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/utils/xorgconfig/cards.c,v 1.4 2005/07/01 22:43:35 daniels Exp $ */ /* $XConsortium: cards.c /main/9 1996/10/19 18:15:32 kaleb $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.c,v 3.16 2001/07/25 15:05:09 dawes Exp $ */ /* * Functions to manipulate card database. diff --git a/hw/xfree86/utils/xorgconfig/cards.h b/hw/xfree86/utils/xorgconfig/cards.h index 1d9892491..b667ec685 100644 --- a/hw/xfree86/utils/xorgconfig/cards.h +++ b/hw/xfree86/utils/xorgconfig/cards.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.h,v 3.4 1999/03/28 15:33:07 dawes Exp $ */ diff --git a/hw/xfree86/utils/xorgconfig/xorgconfig.c b/hw/xfree86/utils/xorgconfig/xorgconfig.c index 3bc05b83b..e00830aa9 100644 --- a/hw/xfree86/utils/xorgconfig/xorgconfig.c +++ b/hw/xfree86/utils/xorgconfig/xorgconfig.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c,v 3.69 2003/02/20 04:05:15 dawes Exp $ */ /* * This is a configuration program that will create a base XF86Config @@ -93,7 +92,6 @@ * Chisato Yamauchi(cyamauch@phyas.aichi-edu.ac.jp) */ /* $XConsortium: xf86config.c /main/21 1996/10/28 05:43:57 kaleb $ */ -/* $XdotOrg: xserver/xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c,v 1.20 2006/04/18 17:28:44 spyderous Exp $ */ #ifdef HAVE_CONFIG_H # include "xorg-server.h" |