Merge pull request #7705 from keszybz/redo-linking

author Lennart Poettering <lennart@poettering.net>

Wed, 3 Jan 2018 17:37:00 +0000 (18:37 +0100)

committer GitHub <noreply@github.com>

Wed, 3 Jan 2018 17:37:00 +0000 (18:37 +0100)
author Lennart Poettering <lennart@poettering.net>
Wed, 3 Jan 2018 17:37:00 +0000 (18:37 +0100)
committer GitHub <noreply@github.com>
Wed, 3 Jan 2018 17:37:00 +0000 (18:37 +0100)
diff --cc meson.build
Simple merge
diff --cc src/basic/meson.build
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Wed, 3 Jan 2018 17:37:00 +0000 (18:37 +0100)
committer	GitHub <noreply@github.com>
	Wed, 3 Jan 2018 17:37:00 +0000 (18:37 +0100)
		1	2
meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
src/basic/meson.build	patch \|	diff1 \|	diff2 \|	blob \| history