diff options
| author |  Tom Willemsen | 2012-10-12 08:52:53 +0200 |
|---|---|---|
| committer | Tom Willemsen | 2012-10-12 08:52:53 +0200 |
| commit | 77c39ea0f082446f21981bd0876a4f1fde3c4807 (patch) | |
| tree | 8843848d7c92d6be20a3e23bd22c0c9e5218022d /.xinitrc | |
| parent | 8bcf0ae40fc2e9c6565567131218029768859839 (diff) | |
| parent | 1f3bdb9e4490e20aefd7038a507aee50c76728dc (diff) | |
| download | dotfiles-77c39ea0f082446f21981bd0876a4f1fde3c4807.tar.gz dotfiles-77c39ea0f082446f21981bd0876a4f1fde3c4807.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.config/cower/config
.emacs.d/init.el
Diffstat (limited to '.xinitrc')
| -rw-r--r-- | .xinitrc | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -12,4 +12,4 @@ fi # rox -b Default test -n "$1" && wm=$1 || wm="awesome" # wm="emacsclient -ce \"(oni:wm-init)\"" -exec ck-launch-session $wm +exec $wm |