Merge branch 'master' into kill

This commit is contained in:
Daniel Hahler 2018-07-18 00:20:56 +02:00 committed by GitHub
commit 89bcb8dc20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions

View File

@ -75,15 +75,15 @@ local active_font
--- The client border width.
-- @beautiful beautiful.border_width
--- The default clients border width.
--- The default clients border color.
-- Note that only solid colors are supported.
-- @beautiful beautiful.border_normal
--- The focused client border width.
--- The focused client border color.
-- Note that only solid colors are supported.
-- @beautiful beautiful.border_focus
--- The marked clients border width.
--- The marked clients border color.
-- Note that only solid colors are supported.
-- @beautiful beautiful.border_marked