merge upstream

diff --cc spectrwm.c
index f81d1a2,41e20cf..dbcd5f6
--- 1/spectrwm.c
--- 2/spectrwm.c
+++ b/spectrwm.c
@@@ -401,9 -402,7 +402,10 @@@ bool               stack_enabled = true
  bool           clock_enabled = true;
  bool           iconic_enabled = false;
  bool           urgent_enabled = false;
 +int            composite_enabled = 0;
 +double                 opacity_focus = 1.0;
 +double                 opacity_unfocus = 0.6;
+ bool           urgent_collapse = false;
  char          *clock_format = NULL;
  bool           window_class_enabled = false;
  bool           window_instance_enabled = false;

diff --cc spectrwm.conf
Simple merge