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

diff -r d6057999ab28 -r e5bec43370b8 config.meillo.h
--- a/config.meillo.h	Fri Jun 15 23:15:21 2007 +0200
+++ b/config.meillo.h	Sat Jun 16 21:45:08 2007 +0200
@@ -37,7 +37,7 @@
 	{ MODKEY,			XK_1, 	zoom,		{ 0 } }, \
 	{ MODKEY, 		XK_2,		killclient,	{ 0 } }, \
 	{ MODKEY|ShiftMask,		XK_q,		quit,		{ 0 } }, \
-	{ MODKEY|ShiftMask,			XK_F4,		spawn,		{ .cmd = "exec sudo halt" } }, \
+	{ MODKEY|ShiftMask,			XK_F4,		spawn,		{ .cmd = "sudo /sbin/shutdown -t 3 now" } }, \
 	{ MODKEY,			XK_space,	togglemode,	{ 0 } }, \
 	{ MODKEY|ShiftMask,		XK_space,	togglefloat,	{ 0 } }, \
 	{ MODKEY,			XK_g,		resizemaster,	{ .i = 15 } }, \