Merge pull request #12424 from poettering/logind-brightness

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

Wed, 12 Jun 2019 12:28:09 +0000 (14:28 +0200)

committer GitHub <noreply@github.com>

Wed, 12 Jun 2019 12:28:09 +0000 (14:28 +0200)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 12 Jun 2019 12:28:09 +0000 (14:28 +0200)
committer GitHub <noreply@github.com>
Wed, 12 Jun 2019 12:28:09 +0000 (14:28 +0200)
diff --cc TODO
Simple merge
diff --cc src/libsystemd/sd-bus/bus-common-errors.c
Simple merge
diff --cc src/libsystemd/sd-bus/bus-common-errors.h
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Wed, 12 Jun 2019 12:28:09 +0000 (14:28 +0200)
committer	GitHub <noreply@github.com>
	Wed, 12 Jun 2019 12:28:09 +0000 (14:28 +0200)
		1	2
TODO	patch \|	diff1 \|	diff2 \|	blob \| history
src/libsystemd/sd-bus/bus-common-errors.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/libsystemd/sd-bus/bus-common-errors.h	patch \|	diff1 \|	diff2 \|	blob \| history