branch merge

diff --combined config.def.h
index 9bec26b,075c8d5..d2c5318
--- 1/config.def.h
--- 2/config.def.h
+++ b/config.def.h
@@@ -21,14 -21,14 +21,14 @@@ static uint xidx                    = 0
  static const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
  
  static Rule rules[] = {
-       /* class      instance    title       tags ref      isfloating */
+       /* class      instance    title       tags mask     isfloating */
        { "Gimp",     NULL,       NULL,       0,            True },
        { "Firefox",  NULL,       NULL,       1 << 8,       True },
  };
  
  /* layout(s) */
 -static float mfact           = 0.55;
 -static Bool resizehints       = False;     /* False means respect size hints in tiled resizals */
 +static float mfact      = 0.55;
 +static Bool resizehints = True; /* False means respect size hints in tiled resizals */
  
  static Layout layouts[] = {
        /* symbol     arrange function */