summaryrefslogtreecommitdiffstats
path: root/.config/awesome/rc.lua
diff options
context:
space:
mode:
authorGravatar Tom Willemsen2012-09-25 22:20:43 +0200
committerGravatar Tom Willemsen2012-09-25 22:20:43 +0200
commit5b8d412cf79168fc6cdd45eac3ce65934d1f7b8d (patch)
treef534c84e67552c694dfa0cb5a6178446801612f2 /.config/awesome/rc.lua
parentb2de3d6412ba51111ce9b51cc2a3b384735e040a (diff)
parent73700816128c0788e822710dbad5e0bd3d8d54bf (diff)
downloaddotfiles-5b8d412cf79168fc6cdd45eac3ce65934d1f7b8d.tar.gz
dotfiles-5b8d412cf79168fc6cdd45eac3ce65934d1f7b8d.zip
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts: .emacs.d/init.el
Diffstat (limited to '.config/awesome/rc.lua')
-rw-r--r--.config/awesome/rc.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 4ad3bf4..38e9a72 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -268,7 +268,7 @@ root.buttons(awful.util.table.join(
local bind = keychain
local sub = keychain.sub
globalkeys = awful.util.table.join(
- bind({ "Control", }, "z",
+ bind({ "Control", }, "i",
{ sub({ }, "o",
function ()
awful.client.focus.byidx(1)