Merge branch 'master' into next

2015-01-31 22:56:08 +01:00
parent dd5be77d1d 20dc3271a7
commit 3f126c61c4
3 changed files with 5 additions and 2 deletions
--- a/parser-specs/config.spec
+++ b/parser-specs/config.spec
@ -45,7 +45,7 @@ state INITIAL:
  exectype = 'exec_always', 'exec'         -> EXEC
  colorclass = 'client.background'
      -> COLOR_SINGLE
-  colorclass = 'client.focused_inactive', 'client.focused', 'client.unfocused', 'client.urgent'
+  colorclass = 'client.focused_inactive', 'client.focused', 'client.unfocused', 'client.urgent', 'client.placeholder'
      -> COLOR_BORDER

 # We ignore comments and 'set' lines (variables).