Merge commit 'ab422974567ae73926c2308c3400b5974d6e09f1^' into HEAD

author Thomas Schwinge <tschwinge@baylibre.com>

Sun, 10 Mar 2024 23:17:15 +0000 (00:17 +0100)

committer Thomas Schwinge <tschwinge@baylibre.com>

Sun, 10 Mar 2024 23:17:15 +0000 (00:17 +0100)
author Thomas Schwinge <tschwinge@baylibre.com>
Sun, 10 Mar 2024 23:17:15 +0000 (00:17 +0100)
committer Thomas Schwinge <tschwinge@baylibre.com>
Sun, 10 Mar 2024 23:17:15 +0000 (00:17 +0100)
diff --cc Makefile.def
Simple merge
diff --cc Makefile.in
Simple merge
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
author	Thomas Schwinge <tschwinge@baylibre.com>
	Sun, 10 Mar 2024 23:17:15 +0000 (00:17 +0100)
committer	Thomas Schwinge <tschwinge@baylibre.com>
	Sun, 10 Mar 2024 23:17:15 +0000 (00:17 +0100)
		1	2
Makefile.def	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history