Merge pull request #5957 from keszybz/test-c++

author Lennart Poettering <lennart@poettering.net>

Wed, 17 May 2017 15:02:55 +0000 (17:02 +0200)

committer GitHub <noreply@github.com>

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