Merge branch 'For2.2.2-Refactoring' into For2.2.2-Fix-Hourier

author Hourier <hourier@users.sourceforge.jp>

Sun, 9 Feb 2020 13:44:05 +0000 (22:44 +0900)

committer Hourier <hourier@users.sourceforge.jp>

Sun, 9 Feb 2020 13:44:05 +0000 (22:44 +0900)
author Hourier <hourier@users.sourceforge.jp>
Sun, 9 Feb 2020 13:44:05 +0000 (22:44 +0900)
committer Hourier <hourier@users.sourceforge.jp>
Sun, 9 Feb 2020 13:44:05 +0000 (22:44 +0900)
diff --cc src/autopick.c
Simple merge
diff --cc src/combat/melee1.c
Simple merge
diff --cc src/monster-process.c
Simple merge
diff --cc src/monster1.c
Simple merge
diff --cc src/spells3.c
Simple merge
author	Hourier <hourier@users.sourceforge.jp>
	Sun, 9 Feb 2020 13:44:05 +0000 (22:44 +0900)
committer	Hourier <hourier@users.sourceforge.jp>
	Sun, 9 Feb 2020 13:44:05 +0000 (22:44 +0900)
		1	2
src/autopick.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/combat/melee1.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/monster-process.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/monster1.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/spells3.c	patch \|	diff1 \|	diff2 \|	blob \| history