Merge branch 'feature/Xft-support' into For2.2.2-Refactoring

author deskull <deskull@Luarcus.local>

Sun, 1 Mar 2020 06:57:13 +0000 (15:57 +0900)

committer deskull <deskull@Luarcus.local>

Sun, 1 Mar 2020 06:57:13 +0000 (15:57 +0900)
author deskull <deskull@Luarcus.local>
Sun, 1 Mar 2020 06:57:13 +0000 (15:57 +0900)
committer deskull <deskull@Luarcus.local>
Sun, 1 Mar 2020 06:57:13 +0000 (15:57 +0900)
diff --cc src/Makefile.am
Simple merge
diff --cc src/h-config.h
Simple merge
author	deskull <deskull@Luarcus.local>
	Sun, 1 Mar 2020 06:57:13 +0000 (15:57 +0900)
committer	deskull <deskull@Luarcus.local>
	Sun, 1 Mar 2020 06:57:13 +0000 (15:57 +0900)
		1	2
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/h-config.h	patch \|	diff1 \|	diff2 \|	blob \| history