Merge commit '69513d6'

Conflicts: src/compton.c src/compton.h
pluto-843 · Sep 28, 2012 · 7c1838c · 7c1838c
2 parents bccda56 + 69513d6
commit 7c1838c
Show file tree

Hide file tree

Showing 3 changed files with 268 additions and 216 deletions.
diff --git a/compton.sample.conf b/compton.sample.conf
@@ -24,9 +24,11 @@ fading = true;
 # fade-delta = 30
 fade-in-step = 0.03
 fade-out-step = 0.03
+# no-fading-openclose = true;
 
 # Other
 mark-wmwin-focused = true;
+mark-ovredir-focused = true;
 
 # Window type settings
 wintypes: