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/xwin/winconfig.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/xwin/winconfig.c')
| -rw-r--r-- | xorg-server/hw/xwin/winconfig.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/hw/xwin/winconfig.c b/xorg-server/hw/xwin/winconfig.c index 022176f62..c2a0ef7ec 100644 --- a/xorg-server/hw/xwin/winconfig.c +++ b/xorg-server/hw/xwin/winconfig.c @@ -136,8 +136,8 @@ winReadConfigfile () /* Parse config file into data structure */
xf86initConfigFiles();
- filename = xf86openConfigFile (CONFIGPATH, xf86ConfigFile, PROJECTROOT);
dirname = xf86openConfigDirFiles (CONFIGDIRPATH, xf86ConfigDir, PROJECTROOT);
+ filename = xf86openConfigFile (CONFIGPATH, xf86ConfigFile, PROJECTROOT);
/* Hack for backward compatibility */
if (!filename && from == X_DEFAULT)
|