OSDN Git Service

Merge branch 'develop' into macos-develop
authorEric Branlund <ebranlund@fastmail.com>
Sat, 1 May 2021 15:53:48 +0000 (08:53 -0700)
committerEric Branlund <ebranlund@fastmail.com>
Sat, 1 May 2021 15:53:48 +0000 (08:53 -0700)
commit61dd52db50e6ff5c5406d93698866bd94766a0d3
tree981cc739f9b5d562c1929722ecb76c114c2f0b8a
parent2259b7257861c612d863b824994583214adb55bf
parentdc34aabee23c28b3b91d78314bfa7ebb3ff1176c
Merge branch 'develop' into macos-develop
src/floor/floor-save.cpp
src/main/angband-initializer.cpp
src/store/purchase-order.cpp
src/store/sell-order.cpp