From: Jason Woofenden <jason@jasonwoof.com>
Date: Sun, 19 Oct 2014 18:49:50 +0000 (-0400)
Subject: merge upstream
X-Git-Url: https://jasonwoof.com/gitweb/?p=spectrwm.git;a=commitdiff_plain;h=refs%2Fheads%2Fjason

merge upstream
---

364a1d113a98587b74b28660a578b3633484b55d
diff --cc spectrwm.c
index f81d1a2,41e20cf..dbcd5f6
--- a/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;