Merge branch 'pacman-debug' into dev

author hayao <hayao@fascode.net>

Sun, 9 May 2021 10:38:00 +0000 (19:38 +0900)

committer hayao <hayao@fascode.net>

Sun, 9 May 2021 10:38:00 +0000 (19:38 +0900)
author hayao <hayao@fascode.net>
Sun, 9 May 2021 10:38:00 +0000 (19:38 +0900)
committer hayao <hayao@fascode.net>
Sun, 9 May 2021 10:38:00 +0000 (19:38 +0900)
diff --cc build.sh
Simple merge
diff --cc default.conf
Simple merge
author	hayao <hayao@fascode.net>
	Sun, 9 May 2021 10:38:00 +0000 (19:38 +0900)
committer	hayao <hayao@fascode.net>
	Sun, 9 May 2021 10:38:00 +0000 (19:38 +0900)
		1	2
build.sh	patch \|	diff1 \|	diff2 \|	blob \| history
default.conf	patch \|	diff1 \|	diff2 \|	blob \| history