diff options
| author | marha <marha@users.sourceforge.net> | 2010-02-15 08:14:29 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-02-15 08:14:29 +0000 |
| commit | b40e949511ca8c00cd7d13c622b5247145d44ab3 (patch) | |
| tree | ce21480d852a4748ad12a56f3579acf1cbc09f41 /xorg-server/hw/xfree86/common/xf86Config.c | |
| parent | fb89fb367b0defb8016ac97af590a6f5873c217f (diff) | |
| parent | 6f0a8e51f20073ea01ac5dae8e5c4d49076fc65e (diff) | |
| download | vcxsrv-b40e949511ca8c00cd7d13c622b5247145d44ab3.tar.gz vcxsrv-b40e949511ca8c00cd7d13c622b5247145d44ab3.tar.bz2 vcxsrv-b40e949511ca8c00cd7d13c622b5247145d44ab3.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86Config.c')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Config.c b/xorg-server/hw/xfree86/common/xf86Config.c index 1abc182da..132e8bc37 100644 --- a/xorg-server/hw/xfree86/common/xf86Config.c +++ b/xorg-server/hw/xfree86/common/xf86Config.c @@ -2460,8 +2460,8 @@ xf86HandleConfigFile(Bool autoconfig) dirfrom = X_CMDLINE; xf86initConfigFiles(); - filename = xf86openConfigFile(filesearch, xf86ConfigFile, PROJECTROOT); dirname = xf86openConfigDirFiles(dirsearch, xf86ConfigDir, PROJECTROOT); + filename = xf86openConfigFile(filesearch, xf86ConfigFile, PROJECTROOT); if (filename) { xf86MsgVerb(filefrom, 0, "Using config file: \"%s\"\n", filename); xf86ConfigFile = xnfstrdup(filename); |