Merge remote-tracking branch 'remotes/origin/For2.2.X-Add-Monster' into For2.2.2...

author deskull <deskull@users.sourceforge.jp>

Wed, 12 Feb 2020 15:01:26 +0000 (00:01 +0900)

committer deskull <deskull@users.sourceforge.jp>

Wed, 12 Feb 2020 15:01:26 +0000 (00:01 +0900)
author deskull <deskull@users.sourceforge.jp>
Wed, 12 Feb 2020 15:01:26 +0000 (00:01 +0900)
committer deskull <deskull@users.sourceforge.jp>
Wed, 12 Feb 2020 15:01:26 +0000 (00:01 +0900)
diff --cc src/monster1.c
Simple merge
diff --cc src/spells3.c
Simple merge
author	deskull <deskull@users.sourceforge.jp>
	Wed, 12 Feb 2020 15:01:26 +0000 (00:01 +0900)
committer	deskull <deskull@users.sourceforge.jp>
	Wed, 12 Feb 2020 15:01:26 +0000 (00:01 +0900)
		1	2
src/monster1.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/spells3.c	patch \|	diff1 \|	diff2 \|	blob \| history