OSDN Git Service

Merge branch 'develop' into macos-develop vauto3.0.0-alpha87-cb92ef5fc
authorEric Branlund <ebranlund@fastmail.com>
Sat, 15 Jul 2023 17:08:17 +0000 (11:08 -0600)
committerEric Branlund <ebranlund@fastmail.com>
Sat, 15 Jul 2023 17:08:17 +0000 (11:08 -0600)
commitcb92ef5fcfb2ddc8c06dad3fc5aecc979b8a1e28
tree098e52124538baddab431a6b6071e19e61826715
parent9b72e515d2a1d96008704cfcfc966293ba1919b7
parentf3afbce784e3ea0f1944dbdca062dd7c543e18d1
Merge branch 'develop' into macos-develop
14 files changed:
src/Makefile.am
src/cmd-io/cmd-process-screen.cpp
src/floor/floor-save.cpp
src/main-win/graphics-win.cpp
src/main.cpp
src/main/angband-initializer.cpp
src/main/angband-initializer.h
src/save/floor-writer.cpp
src/save/save.cpp
src/system/h-config.h
src/util/angband-files.cpp
src/util/angband-files.h
src/util/sha256.cpp
src/view/display-map.cpp