Merge pull request #8689 from davide125/static

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

Wed, 9 May 2018 22:39:36 +0000 (00:39 +0200)

committer GitHub <noreply@github.com>

Wed, 9 May 2018 22:39:36 +0000 (00:39 +0200)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 9 May 2018 22:39:36 +0000 (00:39 +0200)
committer GitHub <noreply@github.com>
Wed, 9 May 2018 22:39:36 +0000 (00:39 +0200)
diff --cc meson.build
Simple merge
diff --cc src/basic/meson.build
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Wed, 9 May 2018 22:39:36 +0000 (00:39 +0200)
committer	GitHub <noreply@github.com>
	Wed, 9 May 2018 22:39:36 +0000 (00:39 +0200)
		1	2
meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
src/basic/meson.build	patch \|	diff1 \|	diff2 \|	blob \| history