Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2013-08-12 09:13:55 +02:00
commit 3216cc79de

View File

@ -1806,10 +1806,10 @@ debuglog <on|off|toggle>
------------------------
*Examples*:
------------
------------------------
# Enable/disable logging
bindsym $mod+x debuglog toggle
------------
------------------------
=== Reloading/Restarting/Exiting