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/src/config_directives.c
+++ b/src/config_directives.c
@ -392,6 +392,7 @@ CFGFUN(color, const char *colorclass, const char *border, const char *background
    APPLY_COLORS(focused);
    APPLY_COLORS(unfocused);
    APPLY_COLORS(urgent);
+    APPLY_COLORS(placeholder);

 #undef APPLY_COLORS
 }