Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-11-27 21:44:28 +00:00
commit 356d80c15b
2 changed files with 2 additions and 2 deletions

View File

@ -148,7 +148,7 @@ bindsym Mod1+r mode "resize"
# Start i3bar to display a workspace bar (plus the system information i3status # Start i3bar to display a workspace bar (plus the system information i3status
# finds out, if available) # finds out, if available)
bar { bar {
status_command i3status status_command i3status
} }
####################################################################### #######################################################################

View File

@ -149,5 +149,5 @@ bindcode $mod+27 mode "resize"
# Start i3bar to display a workspace bar (plus the system information i3status # Start i3bar to display a workspace bar (plus the system information i3status
# finds out, if available) # finds out, if available)
bar { bar {
status_command i3status status_command i3status
} }