OSDN Git Service

Merge remote-tracking branch 'remotes/origin/For2.2.2-Fix-Hourier' into For2.2.2...
authordeskull <deskull@users.sourceforge.jp>
Sun, 3 May 2020 12:38:38 +0000 (21:38 +0900)
committerdeskull <deskull@users.sourceforge.jp>
Sun, 3 May 2020 12:38:38 +0000 (21:38 +0900)
commitd24e1b827a3573e567cfee1febe9c5ca558bcd75
tree739ee1666235180b3208b7ba2eb8731649d41e3d
parentdbd97081170c97a78027d5ca8c818a874f4f1ee2
parenta1c5522f7c40cf95a21e21aa4a0ebbb167ceacb7
Merge remote-tracking branch 'remotes/origin/For2.2.2-Fix-Hourier' into For2.2.2-Refactoring
20 files changed:
src/cmd/cmd-activate.c
src/cmd/cmd-read.c
src/cmd/cmd-spell.c
src/cmd/cmd-zaprod.c
src/market/building.c
src/mind.c
src/racial.c
src/realm/realm-arcane.c
src/realm/realm-craft.c
src/realm/realm-death.c
src/realm/realm-hissatsu.c
src/realm/realm-life.c
src/realm/realm-nature.c
src/realm/realm-sorcery.c
src/realm/realm-trump.c
src/spells.h
src/spells3.c
src/targeting.c
src/view/display-main-window.c
src/wizard2.c