Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-08-29 15:17:53 +02:00
commit 1a34d250bb
1 changed files with 1 additions and 1 deletions

View File

@ -415,7 +415,7 @@ This option determines which border style new windows will have.
*Syntax*:
---------------------------------------------
new_window <normal|1pixel|borderless>
new_window <normal|1pixel|none>
---------------------------------------------
*Example*: