Merge branch 'work' into wip/mikabox

author Mikael Magnusson <mikachu@gmail.com>

Mon, 12 Mar 2018 14:03:53 +0000 (15:03 +0100)

committer Mikael Magnusson <mikachu@gmail.com>

Mon, 12 Mar 2018 14:03:53 +0000 (15:03 +0100)
author Mikael Magnusson <mikachu@gmail.com>
Mon, 12 Mar 2018 14:03:53 +0000 (15:03 +0100)
committer Mikael Magnusson <mikachu@gmail.com>
Mon, 12 Mar 2018 14:03:53 +0000 (15:03 +0100)
diff --cc Makefile.am
Simple merge
diff --cc openbox/config.c
Simple merge
diff --cc openbox/config.h
Simple merge
diff --cc openbox/moveresize.c
Simple merge
diff --cc openbox/screen.c
Simple merge
author	Mikael Magnusson <mikachu@gmail.com>
	Mon, 12 Mar 2018 14:03:53 +0000 (15:03 +0100)
committer	Mikael Magnusson <mikachu@gmail.com>
	Mon, 12 Mar 2018 14:03:53 +0000 (15:03 +0100)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
openbox/config.c	patch \|	diff1 \|	diff2 \|	blob \| history
openbox/config.h	patch \|	diff1 \|	diff2 \|	blob \| history
openbox/moveresize.c	patch \|	diff1 \|	diff2 \|	blob \| history
openbox/screen.c	patch \|	diff1 \|	diff2 \|	blob \| history