diff options
| author |  Tom Willemsen | 2012-10-26 01:46:09 +0200 |
|---|---|---|
| committer | Tom Willemsen | 2012-10-26 01:46:09 +0200 |
| commit | cbdfa4cac317cbde73da1bbbc4bae37c6617f5d9 (patch) | |
| tree | 5c0040ca1c8e8ea10f0c8b4d647d579d72c4bc18 /.emacs.d/site-lisp/wm-init.el | |
| parent | d6be1ae80fb59495c6bb72b5b6248b5c9a08b4c7 (diff) | |
| parent | 2e70340b951f485d45b95684e7910d1a78917d03 (diff) | |
| download | dotfiles-cbdfa4cac317cbde73da1bbbc4bae37c6617f5d9.tar.gz dotfiles-cbdfa4cac317cbde73da1bbbc4bae37c6617f5d9.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.emacs.d/site-lisp/oni.el
Diffstat (limited to '.emacs.d/site-lisp/wm-init.el')
| -rw-r--r-- | .emacs.d/site-lisp/wm-init.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.emacs.d/site-lisp/wm-init.el b/.emacs.d/site-lisp/wm-init.el index 1ff0501..694acab 100644 --- a/.emacs.d/site-lisp/wm-init.el +++ b/.emacs.d/site-lisp/wm-init.el @@ -1,3 +1,3 @@ (async-shell-command "herbstluftwm" " herbstluftwm") (async-shell-command "dunst" " dunst") -(async-shell-command "xbindkeys -n" " xbindkeys") +(async-shell-command "xbindkeys" " xbindkeys") |