diff options
| author |  Tom Willemsen | 2012-11-21 01:23:32 +0100 |
|---|---|---|
| committer | Tom Willemsen | 2012-11-21 01:23:32 +0100 |
| commit | fa717d86a07d009ab324a40cd8dbf539e61a9da3 (patch) | |
| tree | 94c8970eff710864d3162bb7b14476e6fba8280c /.xinitrc | |
| parent | 258cda86caf88bcfb16aa7ab59f790f249b92d63 (diff) | |
| parent | c545bedf7fa756531b0c486845a6f9af36a83eb2 (diff) | |
| download | dotfiles-fa717d86a07d009ab324a40cd8dbf539e61a9da3.tar.gz dotfiles-fa717d86a07d009ab324a40cd8dbf539e61a9da3.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Diffstat (limited to '.xinitrc')
| -rwxr-xr-x | .xinitrc | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -12,5 +12,5 @@ fi emacs --daemon & fehlstart & -test -n "$1" && wm=$1 || wm="herbstluftwm" +test -n "$1" && wm=$1 || wm="sawfish" exec $wm |