diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2009-10-04 10:53:31 +0200 |
|---|---|---|
| committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2009-10-04 10:53:31 +0200 |
| commit | a97e551d7dbc294cfe249ac78e6e0af2ba8ac7bc (patch) | |
| tree | 60ca1510e469dbe6caadd5239c929ce718e815ca /xinitrc.cpp | |
| parent | f96e0b14bba177b055b50064b430115ff245ea1a (diff) | |
| parent | 2861f9cf845107870f9d5e9898e5cd4baba8d8f7 (diff) | |
Merge remote branch 'origin/master' into obsd
Conflicts:
xinit.c
xinitrc.cpp
Diffstat (limited to 'xinitrc.cpp')
| -rw-r--r-- | xinitrc.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/xinitrc.cpp b/xinitrc.cpp index d446f3c..0440518 100644 --- a/xinitrc.cpp +++ b/xinitrc.cpp @@ -1,6 +1,4 @@ XCOMM!SHELL_CMD -XCOMM $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ -XCOMM $OpenBSD: xinitrc.cpp,v 1.3 2008/04/20 13:46:02 matthieu Exp $ userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap |