Merge branch 'master' into MERFOLK

author Deskull <deskull@users.sourceforge.jp>

Fri, 14 Dec 2018 23:29:41 +0000 (08:29 +0900)

committer Deskull <deskull@users.sourceforge.jp>

Fri, 14 Dec 2018 23:29:41 +0000 (08:29 +0900)
author Deskull <deskull@users.sourceforge.jp>
Fri, 14 Dec 2018 23:29:41 +0000 (08:29 +0900)
committer Deskull <deskull@users.sourceforge.jp>
Fri, 14 Dec 2018 23:29:41 +0000 (08:29 +0900)
diff --cc src/dungeon.c
Simple merge
diff --cc src/spells1.c
Simple merge
author	Deskull <deskull@users.sourceforge.jp>
	Fri, 14 Dec 2018 23:29:41 +0000 (08:29 +0900)
committer	Deskull <deskull@users.sourceforge.jp>
	Fri, 14 Dec 2018 23:29:41 +0000 (08:29 +0900)
		1	2
src/dungeon.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/spells1.c	patch \|	diff1 \|	diff2 \|	blob \| history