Merge branch 'master' of https://github.com/BinBashBanana/util-linux

author Karel Zak <kzak@redhat.com>

Tue, 2 Apr 2024 11:19:03 +0000 (13:19 +0200)

committer Karel Zak <kzak@redhat.com>

Tue, 2 Apr 2024 11:19:03 +0000 (13:19 +0200)
author Karel Zak <kzak@redhat.com>
Tue, 2 Apr 2024 11:19:03 +0000 (13:19 +0200)
committer Karel Zak <kzak@redhat.com>
Tue, 2 Apr 2024 11:19:03 +0000 (13:19 +0200)
diff --cc configure.ac
Simple merge
diff --cc meson.build
Simple merge
author	Karel Zak <kzak@redhat.com>
	Tue, 2 Apr 2024 11:19:03 +0000 (13:19 +0200)
committer	Karel Zak <kzak@redhat.com>
	Tue, 2 Apr 2024 11:19:03 +0000 (13:19 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
meson.build	patch \|	diff1 \|	diff2 \|	blob \| history