Merge branch 'work' into wip/mikabox

author Mikael Magnusson <mikachu@gmail.com>

Fri, 20 Feb 2009 16:45:24 +0000 (17:45 +0100)

committer Mikael Magnusson <mikachu@gmail.com>

Fri, 20 Feb 2009 16:45:24 +0000 (17:45 +0100)
author Mikael Magnusson <mikachu@gmail.com>
Fri, 20 Feb 2009 16:45:24 +0000 (17:45 +0100)
committer Mikael Magnusson <mikachu@gmail.com>
Fri, 20 Feb 2009 16:45:24 +0000 (17:45 +0100)
diff --cc data/rc.xml
Simple merge
diff --cc openbox/config.c
Simple merge
diff --cc openbox/openbox.c
Simple merge
author	Mikael Magnusson <mikachu@gmail.com>
	Fri, 20 Feb 2009 16:45:24 +0000 (17:45 +0100)
committer	Mikael Magnusson <mikachu@gmail.com>
	Fri, 20 Feb 2009 16:45:24 +0000 (17:45 +0100)
		1	2
data/rc.xml	patch \|	diff1 \|	diff2 \|	blob \| history
openbox/config.c	patch \|	diff1 \|	diff2 \|	blob \| history
openbox/openbox.c	patch \|	diff1 \|	diff2 \|	blob \| history