aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix/main.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-02-11 09:51:46 +0000
committermarha <marha@users.sourceforge.net>2010-02-11 09:51:46 +0000
commit5fb5118fe4afa528cc4a3fe147f4487e90e0c9f5 (patch)
treec2d3355fd5cda30a9ed8fd02b948952cdde3d49e /xorg-server/dix/main.c
parentb9f4c74751c445ad2d35b2591056cae0a716e6e1 (diff)
parent4268e59d0c18a7bfc584189d3418765407d05bbf (diff)
downloadvcxsrv-5fb5118fe4afa528cc4a3fe147f4487e90e0c9f5.tar.gz
vcxsrv-5fb5118fe4afa528cc4a3fe147f4487e90e0c9f5.tar.bz2
vcxsrv-5fb5118fe4afa528cc4a3fe147f4487e90e0c9f5.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/dix/main.c')
-rw-r--r--xorg-server/dix/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/dix/main.c b/xorg-server/dix/main.c
index 78cf716d2..124de5efa 100644
--- a/xorg-server/dix/main.c
+++ b/xorg-server/dix/main.c
@@ -299,9 +299,9 @@ int main(int argc, char *argv[], char *envp[])
InitRootWindow(WindowTable[i]);
InitCoreDevices();
- config_init();
InitInput(argc, argv);
InitAndStartDevices();
+ config_init();
dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);