Merge branch 'work' into wip/mikabox

author Mikael Magnusson <mikachu@comhem.se>

Sun, 4 May 2008 10:06:25 +0000 (12:06 +0200)

committer Mikael Magnusson <mikachu@comhem.se>

Sun, 4 May 2008 10:06:25 +0000 (12:06 +0200)
author Mikael Magnusson <mikachu@comhem.se>
Sun, 4 May 2008 10:06:25 +0000 (12:06 +0200)
committer Mikael Magnusson <mikachu@comhem.se>
Sun, 4 May 2008 10:06:25 +0000 (12:06 +0200)
diff --cc openbox/client.c
Simple merge
diff --cc openbox/client.h
Simple merge
diff --cc openbox/event.c
Simple merge
author	Mikael Magnusson <mikachu@comhem.se>
	Sun, 4 May 2008 10:06:25 +0000 (12:06 +0200)
committer	Mikael Magnusson <mikachu@comhem.se>
	Sun, 4 May 2008 10:06:25 +0000 (12:06 +0200)
		1	2
openbox/client.c	patch \|	diff1 \|	diff2 \|	blob \| history
openbox/client.h	patch \|	diff1 \|	diff2 \|	blob \| history
openbox/event.c	patch \|	diff1 \|	diff2 \|	blob \| history