OSDN Git Service

Merge branch 'For2.2.2-Refactoring' into For2.2.2-Fix-Hourier
authorHourier <hourier@users.sourceforge.jp>
Tue, 21 Apr 2020 14:41:45 +0000 (23:41 +0900)
committerHourier <hourier@users.sourceforge.jp>
Tue, 21 Apr 2020 14:41:45 +0000 (23:41 +0900)
commitbb0c09abfc18c0883671ed1c17b84e5d2ff440c4
tree35021af3766f79df073c051fc67b6b8b5280bd36
parent26d4e19d064a860155fcdb3a7c27c009c2c562cc
parent29ac97a11757c1e92795a67a767715a0408756c9
Merge branch 'For2.2.2-Refactoring' into For2.2.2-Fix-Hourier
23 files changed:
Hengband_vcs2017/Hengband/Hengband.vcxproj
Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
src/Makefile.am
src/birth.c
src/combat/melee1.c
src/core.c
src/core/show-file.c
src/dungeon-file.c
src/init.c
src/market/building.c
src/monster1.c
src/player-damage.c
src/player-effects.c
src/scores.c
src/spells1.c
src/spells3.c
src/store.c
src/targeting.c
src/view-mainwindow.c
src/view/display-player-misc-info.c
src/view/display-player-stat-info.c
src/view/display-player.c
src/wizard2.c