Merge branch 'master' into depend_mode

author Anders F Björklund <anders.f.bjorklund@gmail.com>

Sat, 25 Aug 2018 15:10:41 +0000 (17:10 +0200)

committer Anders F Björklund <anders.f.bjorklund@gmail.com>

Sat, 25 Aug 2018 15:10:41 +0000 (17:10 +0200)
author Anders F Björklund <anders.f.bjorklund@gmail.com>
Sat, 25 Aug 2018 15:10:41 +0000 (17:10 +0200)
committer Anders F Björklund <anders.f.bjorklund@gmail.com>
Sat, 25 Aug 2018 15:10:41 +0000 (17:10 +0200)
diff --cc src/ccache.c
Simple merge
diff --cc src/conf.c
Simple merge
diff --cc test/run
Simple merge
diff --cc unittest/test_conf.c
Simple merge
author	Anders F Björklund <anders.f.bjorklund@gmail.com>
	Sat, 25 Aug 2018 15:10:41 +0000 (17:10 +0200)
committer	Anders F Björklund <anders.f.bjorklund@gmail.com>
	Sat, 25 Aug 2018 15:10:41 +0000 (17:10 +0200)
		1	2
src/ccache.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/conf.c	patch \|	diff1 \|	diff2 \|	blob \| history
test/run	patch \|	diff1 \|	diff2 \|	blob \| history
unittest/test_conf.c	patch \|	diff1 \|	diff2 \|	blob \| history