Merge pull request #34245 from bluca/logind_drop_weak_delay_inhibitor

author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

Tue, 29 Oct 2024 16:13:11 +0000 (17:13 +0100)

committer GitHub <noreply@github.com>

Tue, 29 Oct 2024 16:13:11 +0000 (17:13 +0100)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 29 Oct 2024 16:13:11 +0000 (17:13 +0100)
committer GitHub <noreply@github.com>
Tue, 29 Oct 2024 16:13:11 +0000 (17:13 +0100)
diff --cc NEWS
Simple merge
diff --cc man/org.freedesktop.login1.xml
Simple merge
diff --cc src/login/inhibit.c
Simple merge
diff --cc src/login/logind-dbus.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Tue, 29 Oct 2024 16:13:11 +0000 (17:13 +0100)
committer	GitHub <noreply@github.com>
	Tue, 29 Oct 2024 16:13:11 +0000 (17:13 +0100)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
man/org.freedesktop.login1.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/login/inhibit.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/login/logind-dbus.c	patch \|	diff1 \|	diff2 \|	blob \| history