From 48e04fe01ded12663fd83c8ccb1c502433cf8d63 Mon Sep 17 00:00:00 2001
From: Ivan Kanakarakis <ivan.kanak@gmail.com>
Date: Sat, 26 Nov 2011 11:40:55 +0200
Subject: add CLICK_TO_FOCUS option in config.h

---
 config.h  | 3 ++-
 dminiwm.c | 4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/config.h b/config.h
index 28aace6..a9e9b43 100644
--- a/config.h
+++ b/config.h
@@ -1,4 +1,4 @@
- /* config.h for dminiwm.c [ 0.1.7 ]
+ /* config.h for dminiwm.c [ 0.1.8 ]
  *
  *  Started from catwm 31/12/10
  *  Bad window error checking and numlock checking used from
@@ -35,6 +35,7 @@
 #define DEFAULT_MODE    0  /* 0=Vertical, 1=Fullscreen 2=Horizontal 3=grid */
 #define FOLLOW_MOUSE    1  /* 1=Don't 0=Focus the window the mouse just entered */
 #define FOLLOW_WINDOW   1  /* 1=Don't 0=Follow the window when moved to a different desktop */
+#define CLICK_TO_FOCUS  1  /* 1=Don't 0=Focus an unfocused window when clicked */
 #define DESKTOPS        4  /* Must edit DESKTOPCHANGE keys to suit */
 
 /** Colors **/
diff --git a/dminiwm.c b/dminiwm.c
index 22cbd9d..d25f05b 100644
--- a/dminiwm.c
+++ b/dminiwm.c
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-/* dminiwm.c [ 0.1.7 ]
-=======
 /* dminiwm.c [ 0.1.8 ]
->>>>>>> mirror
 *
 *  I started this from catwm 31/12/10
 *  Bad window error checking and numlock checking used from
-- 
cgit v1.3.1