Merge branch 'master' into For2.2.2-Refactoring

author Deskull <deskull@users.sourceforge.jp>

Mon, 18 Feb 2019 13:12:43 +0000 (22:12 +0900)

committer Deskull <deskull@users.sourceforge.jp>

Mon, 18 Feb 2019 13:12:43 +0000 (22:12 +0900)
author Deskull <deskull@users.sourceforge.jp>
Mon, 18 Feb 2019 13:12:43 +0000 (22:12 +0900)
committer Deskull <deskull@users.sourceforge.jp>
Mon, 18 Feb 2019 13:12:43 +0000 (22:12 +0900)
diff --cc src/racial.c
Simple merge
diff --cc src/store.c
Simple merge
author	Deskull <deskull@users.sourceforge.jp>
	Mon, 18 Feb 2019 13:12:43 +0000 (22:12 +0900)
committer	Deskull <deskull@users.sourceforge.jp>
	Mon, 18 Feb 2019 13:12:43 +0000 (22:12 +0900)
		1	2
src/racial.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/store.c	patch \|	diff1 \|	diff2 \|	blob \| history