Merge remote-tracking branch 'pali/win32-cfgmgr32'

author Martin Mares <mj@ucw.cz>

Sat, 4 Mar 2023 15:58:35 +0000 (16:58 +0100)

committer Martin Mares <mj@ucw.cz>

Sat, 4 Mar 2023 15:58:35 +0000 (16:58 +0100)
author Martin Mares <mj@ucw.cz>
Sat, 4 Mar 2023 15:58:35 +0000 (16:58 +0100)
committer Martin Mares <mj@ucw.cz>
Sat, 4 Mar 2023 15:58:35 +0000 (16:58 +0100)
diff --cc lib/init.c
Simple merge
diff --cc lib/internal.h
Simple merge
author	Martin Mares <mj@ucw.cz>
	Sat, 4 Mar 2023 15:58:35 +0000 (16:58 +0100)
committer	Martin Mares <mj@ucw.cz>
	Sat, 4 Mar 2023 15:58:35 +0000 (16:58 +0100)
		1	2
lib/init.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/internal.h	patch \|	diff1 \|	diff2 \|	blob \| history