aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin/winconfig.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-02-15 07:35:00 +0000
committermarha <marha@users.sourceforge.net>2010-02-15 07:35:00 +0000
commit6f0a8e51f20073ea01ac5dae8e5c4d49076fc65e (patch)
tree3b27eed7119f18ccb58148cab10cd44dbc8b3ed7 /xorg-server/hw/xwin/winconfig.c
parentbdebed13fbe3b1064f9bca04b34643b2587b5304 (diff)
downloadvcxsrv-6f0a8e51f20073ea01ac5dae8e5c4d49076fc65e.tar.gz
vcxsrv-6f0a8e51f20073ea01ac5dae8e5c4d49076fc65e.tar.bz2
vcxsrv-6f0a8e51f20073ea01ac5dae8e5c4d49076fc65e.zip
Git update 15/2/2010
Diffstat (limited to 'xorg-server/hw/xwin/winconfig.c')
-rw-r--r--xorg-server/hw/xwin/winconfig.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/hw/xwin/winconfig.c b/xorg-server/hw/xwin/winconfig.c
index f1e805c4c..259b3d238 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)