Merge pull request #8323 from xyproto/ok_color

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

Fri, 2 Mar 2018 12:00:07 +0000 (13:00 +0100)

committer GitHub <noreply@github.com>

Fri, 2 Mar 2018 12:00:07 +0000 (13:00 +0100)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 2 Mar 2018 12:00:07 +0000 (13:00 +0100)
committer GitHub <noreply@github.com>
Fri, 2 Mar 2018 12:00:07 +0000 (13:00 +0100)
diff --cc meson.build
Simple merge
diff --cc meson_options.txt
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Fri, 2 Mar 2018 12:00:07 +0000 (13:00 +0100)
committer	GitHub <noreply@github.com>
	Fri, 2 Mar 2018 12:00:07 +0000 (13:00 +0100)
		1	2
meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
meson_options.txt	patch \|	diff1 \|	diff2 \|	blob \| history