diff options
author | Egbert Eich <eich@suse.de> | 2004-04-02 21:47:33 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-04-02 21:47:33 +0000 |
commit | 9bbe288d7fd59d4e192a986b8622915ce7b447a9 (patch) | |
tree | fafb6de8b24840bf282667b820de6e2b4d052c04 /hw/xfree86/utils/xorgcfg/loader.c | |
parent | 0f8d2fd7d0c6ff169abed9b07ac63b57d80b8811 (diff) |
70. Merging in the TM branch (Egbert Eich).XORG-RELEASE-1-STSF-FORKXORG-CYGWIN-LAST-MERGE
Diffstat (limited to 'hw/xfree86/utils/xorgcfg/loader.c')
-rw-r--r-- | hw/xfree86/utils/xorgcfg/loader.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/hw/xfree86/utils/xorgcfg/loader.c b/hw/xfree86/utils/xorgcfg/loader.c index 84032f596..138b77778 100644 --- a/hw/xfree86/utils/xorgcfg/loader.c +++ b/hw/xfree86/utils/xorgcfg/loader.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.1.4.1.4.1 2004/03/04 17:48:16 eich Exp $ + * $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.1.4.1.4.2.4.1 2004/03/23 13:54:01 eich Exp $ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.19 2002/06/06 21:03:32 paulo Exp $ */ @@ -188,8 +188,7 @@ LoaderInitializeOptions(void) first = 0; checkerLegend[CHECKER_OPTIONS_FILE_MISSING] = - "The Options file, normally /usr/X11R6/lib/X11/Options was not found.\n" - "In the sources, it is at xc/programs/Xserver/hw/xfree86/Options."; + "The Options file, normally /usr/X11R6/lib/X11/Options was not found.\n"; checkerLegend[CHECKER_OPTION_DESCRIPTION_MISSING] = "No description for the module option. The description should be in\n" "in the Options file, and using the sintax:\n" @@ -207,7 +206,7 @@ LoaderInitializeOptions(void) checkerLegend[CHECKER_NO_OPTIONS_AVAILABLE] = "The driver does not have an AvailableOptions function, or that\n" "function is returning NULL. If the driver is returning NULL, and\n" - "really does not need any options from XF86Config, than the message\n" + "really does not need any options from "__XCONFIGFILE__", than the message\n" "can be ignored."; checkerLegend[CHECKER_NO_VENDOR_CHIPSET] = "The checker could not fetch the PCI chipset/vendor information from\n" |