Merge remote-tracking branch 'remotes/origin/feature/Refactoring-Hourier' into For2...

author deskull <deskull@users.sourceforge.jp>

Mon, 13 Jan 2020 00:26:20 +0000 (09:26 +0900)

committer deskull <deskull@users.sourceforge.jp>

Mon, 13 Jan 2020 00:26:20 +0000 (09:26 +0900)
author deskull <deskull@users.sourceforge.jp>
Mon, 13 Jan 2020 00:26:20 +0000 (09:26 +0900)
committer deskull <deskull@users.sourceforge.jp>
Mon, 13 Jan 2020 00:26:20 +0000 (09:26 +0900)
diff --cc src/mind.c
Simple merge
diff --cc src/player-effects.c
Simple merge
author	deskull <deskull@users.sourceforge.jp>
	Mon, 13 Jan 2020 00:26:20 +0000 (09:26 +0900)
committer	deskull <deskull@users.sourceforge.jp>
	Mon, 13 Jan 2020 00:26:20 +0000 (09:26 +0900)
		1	2
src/mind.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/player-effects.c	patch \|	diff1 \|	diff2 \|	blob \| history