Merge branch 'work' into wip/mikabox
authorMikael Magnusson <mikachu@gmail.com>
Mon, 12 Mar 2018 14:03:53 +0000 (15:03 +0100)
committerMikael Magnusson <mikachu@gmail.com>
Mon, 12 Mar 2018 14:03:53 +0000 (15:03 +0100)
commit0a8859e51be42f2045746d0825f8a3d59e281b4c
treef4b671a8bce80cb4a292010e84b1964b5aa075f4
parent1478cb5371dac9275dd070620dc4f848ff050668
parenta7381307b6dada1d784c721233e01bce85d34fe8
Merge branch 'work' into wip/mikabox
Makefile.am
openbox/config.c
openbox/config.h
openbox/moveresize.c
openbox/screen.c