Merge commit 'nightm4re/3.4-working-padding' into wip/mikabox

author Mikael Magnusson <mikachu@gmail.com>

Sat, 23 Aug 2008 04:42:54 +0000 (06:42 +0200)

committer Mikael Magnusson <mikachu@gmail.com>

Sat, 23 Aug 2008 04:42:54 +0000 (06:42 +0200)
author Mikael Magnusson <mikachu@gmail.com>
Sat, 23 Aug 2008 04:42:54 +0000 (06:42 +0200)
committer Mikael Magnusson <mikachu@gmail.com>
Sat, 23 Aug 2008 04:42:54 +0000 (06:42 +0200)
diff --cc openbox/client.c
Simple merge
diff --cc openbox/resist.c
Simple merge
author	Mikael Magnusson <mikachu@gmail.com>
	Sat, 23 Aug 2008 04:42:54 +0000 (06:42 +0200)
committer	Mikael Magnusson <mikachu@gmail.com>
	Sat, 23 Aug 2008 04:42:54 +0000 (06:42 +0200)
		1	2
openbox/client.c	patch \|	diff1 \|	diff2 \|	blob \| history
openbox/resist.c	patch \|	diff1 \|	diff2 \|	blob \| history