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

author deskull <deskull@users.sourceforge.jp>

Sat, 4 Jan 2020 16:59:51 +0000 (01:59 +0900)

committer deskull <deskull@users.sourceforge.jp>

Sat, 4 Jan 2020 16:59:51 +0000 (01:59 +0900)
author deskull <deskull@users.sourceforge.jp>
Sat, 4 Jan 2020 16:59:51 +0000 (01:59 +0900)
committer deskull <deskull@users.sourceforge.jp>
Sat, 4 Jan 2020 16:59:51 +0000 (01:59 +0900)
diff --cc src/bldg.c
Simple merge
diff --cc src/cmd/cmd-activate.c
Simple merge
diff --cc src/cmd/cmd-read.c
Simple merge
diff --cc src/core.c
Simple merge
author	deskull <deskull@users.sourceforge.jp>
	Sat, 4 Jan 2020 16:59:51 +0000 (01:59 +0900)
committer	deskull <deskull@users.sourceforge.jp>
	Sat, 4 Jan 2020 16:59:51 +0000 (01:59 +0900)
		1	2
src/bldg.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/cmd/cmd-activate.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/cmd/cmd-read.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/core.c	patch \|	diff1 \|	diff2 \|	blob \| history