Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2012-05-18 09:14:38 +02:00
commit d154d347ec

View File

@ -120,10 +120,10 @@ mode "resize" {
bindcode 47 resize grow width 10 px or 10 ppt bindcode 47 resize grow width 10 px or 10 ppt
# same bindings, but for the arrow keys # same bindings, but for the arrow keys
bindsym 113 resize shrink width 10 px or 10 ppt bindcode 113 resize shrink width 10 px or 10 ppt
bindsym 116 resize grow height 10 px or 10 ppt bindcode 116 resize grow height 10 px or 10 ppt
bindsym 111 resize shrink height 10 px or 10 ppt bindcode 111 resize shrink height 10 px or 10 ppt
bindsym 114 resize grow width 10 px or 10 ppt bindcode 114 resize grow width 10 px or 10 ppt
# back to normal: Enter or Escape # back to normal: Enter or Escape
bindcode 36 mode "default" bindcode 36 mode "default"