OSDN Git Service

Merge branch 'For3.0.0-Monster-Adjustment' into release/3.0.0Alpha
authoriks <iks@users.sorceforge.jp>
Sat, 12 Dec 2020 18:06:23 +0000 (03:06 +0900)
committeriks <iks@users.sorceforge.jp>
Sat, 12 Dec 2020 18:06:23 +0000 (03:06 +0900)
1  2 
Hengband/Hengband/Hengband.vcxproj
Hengband/Hengband/Hengband.vcxproj.filters
src/Makefile.am
src/artifact/fixed-art-generator.c
src/cmd-item/cmd-equipment.c
src/cmd-item/cmd-throw.c
src/market/building-craft-fix.c
src/player/player-status-flags.c
src/player/player-status-resist.c
src/player/player-status.c

Simple merge
diff --cc src/Makefile.am
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge