Merge pull request #5432 from keszybz/udev-logging

author Lennart Poettering <lennart@poettering.net>

Fri, 12 May 2017 13:22:46 +0000 (15:22 +0200)

committer GitHub <noreply@github.com>

Fri, 12 May 2017 13:22:46 +0000 (15:22 +0200)
author Lennart Poettering <lennart@poettering.net>
Fri, 12 May 2017 13:22:46 +0000 (15:22 +0200)
committer GitHub <noreply@github.com>
Fri, 12 May 2017 13:22:46 +0000 (15:22 +0200)
diff --cc Makefile.am
Simple merge
diff --cc meson.build
Simple merge
diff --cc src/udev/meson.build
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Fri, 12 May 2017 13:22:46 +0000 (15:22 +0200)
committer	GitHub <noreply@github.com>
	Fri, 12 May 2017 13:22:46 +0000 (15:22 +0200)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
src/udev/meson.build	patch \|	diff1 \|	diff2 \|	blob \| history