diff options
| author | Stefan Ritter <xeno@thehappy.de> | 2011-05-30 09:17:43 +0200 |
|---|---|---|
| committer | Stefan Ritter <xeno@thehappy.de> | 2011-05-30 09:17:43 +0200 |
| commit | 14deaec2f669cb59ffd6ff6cb59c1f9942ec6024 (patch) | |
| tree | 36a6e02ae7b3c057188488fd400db17213171359 | |
| parent | 55d5c812ef5405c6a4c946f5c776721c370fe398 (diff) | |
| parent | 5034b54a232e11778509d651619682ba47311c78 (diff) | |
Merge branch 'master' of fucktheforce.de:xeno
Conflicts:
xorg/xresources
| -rw-r--r-- | i3/config | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -66,8 +66,7 @@ bind $mod+36 exec /usr/bin/urxvt bind $mod+26 exec /usr/bin/xscreensaver-command -lock bind $mod+33 exec /usr/bin/dmenu_run -bind $mod+Control+33 exit -bind $mod+Control+45 restart +bind $mod+Shift+33 exit exec i3status | dzen2 -bg '#000000' -fn '-xos4-terminus-*-*-*-*-12-*-*-*-*-*-*-*' |