Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-08-23 21:32:56 +02:00
commit b28457f663
2 changed files with 4 additions and 4 deletions

View File

@ -16,13 +16,13 @@ font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
floating_modifier Mod1 floating_modifier Mod1
# start a terminal # start a terminal
bindsym Mod1+Return exec /usr/bin/urxvt bindsym Mod1+Return exec urxvt
# kill focused window # kill focused window
bindsym Mod1+Shift+q kill bindsym Mod1+Shift+q kill
# start dmenu (a program launcher) # start dmenu (a program launcher)
bindsym Mod1+d exec /usr/bin/dmenu_run bindsym Mod1+d exec dmenu_run
# change focus # change focus
bindsym Mod1+j focus left bindsym Mod1+j focus left

View File

@ -17,13 +17,13 @@ font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
floating_modifier $mod floating_modifier $mod
# start a terminal # start a terminal
bindcode $mod+36 exec /usr/bin/urxvt bindcode $mod+36 exec urxvt
# kill focused window # kill focused window
bindcode $mod+Shift+24 kill bindcode $mod+Shift+24 kill
# start dmenu (a program launcher) # start dmenu (a program launcher)
bindcode $mod+40 exec /usr/bin/dmenu_run bindcode $mod+40 exec dmenu_run
# change focus # change focus
bindcode $mod+44 focus left bindcode $mod+44 focus left