]>
Commit | Line | Data |
---|---|---|
8af5c795 JR |
1 | Binary files XFree86-3.3.5.orig/xc/doc/specs/XIE/XIEProto/ch8_xie.doc and XFree86-3.3.5/xc/doc/specs/XIE/XIEProto/ch8_xie.doc differ |
2 | diff -urN XFree86-3.3.5.orig/xc/programs/Xserver/hw/xfree86/common/xf86Config.c XFree86-3.3.5/xc/programs/Xserver/hw/xfree86/common/xf86Config.c | |
3 | --- XFree86-3.3.5.orig/xc/programs/Xserver/hw/xfree86/common/xf86Config.c Thu Jul 29 11:22:44 1999 | |
4 | +++ XFree86-3.3.5/xc/programs/Xserver/hw/xfree86/common/xf86Config.c Thu Sep 2 19:42:40 1999 | |
5 | @@ -774,11 +774,11 @@ | |
b1965acc JR |
6 | } |
7 | ||
8 | /* | |
9 | - * /etc/XF86Config | |
10 | + * /etc/X11/XF86Config | |
11 | */ | |
12 | configPaths[++pcount] = (char *)xalloc(PATH_MAX); | |
8af5c795 | 13 | #if !defined(__QNX__) || defined(__QNXNTO__) |
b1965acc JR |
14 | - strcpy(configPaths[pcount], "/etc/XF86Config"); |
15 | + strcpy(configPaths[pcount], "/etc/X11/XF86Config"); | |
8af5c795 JR |
16 | #else |
17 | /* On QNX, we default to /etc/config/XF86Config.nid to | |
18 | * keep config files separate for network setups |