diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2008-11-29 15:46:34 +0100 |
|---|---|---|
| committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2008-11-29 15:46:34 +0100 |
| commit | 3c6b3e07e9e25d27fc45c9159bb77b32d6392e9f (patch) | |
| tree | 3179e9dc0bbc000b68a557ce89ddff9bca1e1182 /xinitrc.cmd | |
| parent | f24144641b2bad8e1aef1ae68502c19633e3d612 (diff) | |
| parent | 754efe651165ea7dd034f6b0ce75ef785deab826 (diff) | |
Merge commit 'origin/master' into obsd
Conflicts:
configure.ac
xinit.c
xinitrc.cpp
Diffstat (limited to 'xinitrc.cmd')
0 files changed, 0 insertions, 0 deletions