summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
Diffstat (limited to 'README.md')
-rw-r--r--README.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/README.md b/README.md
index c035e9a..508e259 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
Here is dwm 6.1 for with applied patches:
pertag
?opacity
@@ -7,3 +8,9 @@ systemtray
All patches can be turned off/on with menuconfig. Configuration
utility mconf can be taken from linux kernel. For succesfully
compile all sources mconf isnt needed.
+=======
+dwm-fancy
+=========
+
+fork of dwm 6.1 with patchs applied and added kernel menuconfig configuration
+>>>>>>> 41fe4babc896a28ea5e08230762cdecd9772de73