Merge branch 'master' of https://github.com/johanmalm/labwc

author Johan Malm <jgm323@gmail.com>

Mon, 4 Oct 2021 05:24:34 +0000 (06:24 +0100)

committer Johan Malm <jgm323@gmail.com>

Mon, 4 Oct 2021 05:24:34 +0000 (06:24 +0100)
author Johan Malm <jgm323@gmail.com>
Mon, 4 Oct 2021 05:24:34 +0000 (06:24 +0100)
committer Johan Malm <jgm323@gmail.com>
Mon, 4 Oct 2021 05:24:34 +0000 (06:24 +0100)
diff --cc include/labwc.h
Simple merge
diff --cc src/cursor.c
Simple merge
author	Johan Malm <jgm323@gmail.com>
	Mon, 4 Oct 2021 05:24:34 +0000 (06:24 +0100)
committer	Johan Malm <jgm323@gmail.com>
	Mon, 4 Oct 2021 05:24:34 +0000 (06:24 +0100)
		1	2
include/labwc.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/cursor.c	patch \|	diff1 \|	diff2 \|	blob \| history