diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2010-04-24 21:13:14 +0200 |
|---|---|---|
| committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2010-04-24 21:13:14 +0200 |
| commit | c92927b23ee9dc895638dd1940c020a71be26f79 (patch) | |
| tree | d7bee16bf654fef0904c280a075e9fdc26cc1fe8 /xinitrc.cpp | |
| parent | df7ea6dc407e0ad984773ff374a69a6a9b20a155 (diff) | |
| parent | c82295911409c611c097ef2e1269a78d54314304 (diff) | |
Merge remote branch 'origin/master' into obsd
Conflicts:
xinitrc.cpp
Diffstat (limited to 'xinitrc.cpp')
| -rw-r--r-- | xinitrc.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/xinitrc.cpp b/xinitrc.cpp index 0440518..e926b19 100644 --- a/xinitrc.cpp +++ b/xinitrc.cpp @@ -51,6 +51,13 @@ fi XCOMM start some nice programs +if [ -d XINITDIR/xinitrc.d ] ; then + for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do + [ -x "$f" ] && . "$f" + done + unset f +fi + XCLOCK -geometry 50x50-1+1 & XCONSOLE -iconic & XTERM -geometry 80x24 & |