godzil/wmfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master in bacardi55 branch

Browse Source
This commit is contained in:
Raphael Khaiat 2010-11-18 19:48:18 +01:00
parent 20c99826ce
commit 546366b282
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wmfs.c
View File

@ -286,12 +286,7 @@ uicb_reload(uicb_t cmd)
for(; argv_global[0] && argv_global[0] == ' '; ++argv_global);
<<<<<<< HEAD
execvp(argv_global, all_argv);
=======
/* add -C to always load the same config file */
execlp(argv_global, argv_global, "-C", conf.confpath, NULL);
>>>>>>> master
return;
}