Merge pull request #11827 from keszybz/pkgconfig-variables

author Lennart Poettering <lennart@poettering.net>

Tue, 26 Feb 2019 17:58:03 +0000 (18:58 +0100)

committer GitHub <noreply@github.com>

Tue, 26 Feb 2019 17:58:03 +0000 (18:58 +0100)
author Lennart Poettering <lennart@poettering.net>
Tue, 26 Feb 2019 17:58:03 +0000 (18:58 +0100)
committer GitHub <noreply@github.com>
Tue, 26 Feb 2019 17:58:03 +0000 (18:58 +0100)
diff --cc meson.build
Simple merge
diff --cc meson_options.txt
Simple merge
diff --cc src/core/systemd.pc.in
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Tue, 26 Feb 2019 17:58:03 +0000 (18:58 +0100)
committer	GitHub <noreply@github.com>
	Tue, 26 Feb 2019 17:58:03 +0000 (18:58 +0100)
		1	2
meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
meson_options.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/systemd.pc.in	patch \|	diff1 \|	diff2 \|	blob \| history