# HG changeset patch
# User meillo@marmaro.de
# Date 1182023108 -7200
# Node ID e5bec43370b8466c9c3deeafe0d1d992769a2f64
# Parent  d6057999ab2866d840c82d0424f80fba5e60209c# Parent  743061dbe7f287c5f6936720429acc725bd28df3
merge

diff -r 743061dbe7f2 -r e5bec43370b8 .hgtags
diff -r 743061dbe7f2 -r e5bec43370b8 LICENSE
diff -r 743061dbe7f2 -r e5bec43370b8 Makefile
diff -r 743061dbe7f2 -r e5bec43370b8 README
diff -r 743061dbe7f2 -r e5bec43370b8 client.c
diff -r 743061dbe7f2 -r e5bec43370b8 config.arg.h
diff -r 743061dbe7f2 -r e5bec43370b8 config.default.h
diff -r 743061dbe7f2 -r e5bec43370b8 config.meillo.h
--- a/config.meillo.h	Sat Jun 16 21:44:00 2007 +0200
+++ b/config.meillo.h	Sat Jun 16 21:45:08 2007 +0200
@@ -55,6 +55,7 @@
 	/* class:instance:title regex	tags regex	isfloat */ \
 	{ "URxvt.*",	  	  	"Das Nichts",	    	False }, \
 	{ "MPlayer.*",		  	NULL,	    	True }, \
+	{ "qiv.*",		  	    NULL,	    	False }, \
 	{ "Gimp.*",	      		"Das Alles",		True }, \
 	{ ".*",		          	"Das Alles",	    	False }, \
 };
diff -r 743061dbe7f2 -r e5bec43370b8 config.mk
diff -r 743061dbe7f2 -r e5bec43370b8 draw.c
diff -r 743061dbe7f2 -r e5bec43370b8 dwm.1
diff -r 743061dbe7f2 -r e5bec43370b8 dwm.h
diff -r 743061dbe7f2 -r e5bec43370b8 dwm.png
diff -r 743061dbe7f2 -r e5bec43370b8 event.c
diff -r 743061dbe7f2 -r e5bec43370b8 main.c
diff -r 743061dbe7f2 -r e5bec43370b8 tag.c
diff -r 743061dbe7f2 -r e5bec43370b8 util.c
diff -r 743061dbe7f2 -r e5bec43370b8 view.c