OSDN Git Service

(root) / hengbandforosx / hengbandosx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 302dcf2 2d22994)
Merge branch 'develop' into macos-develop vauto3.0.0-alpha83-b7257c6f7
authorEric Branlund <ebranlund@fastmail.com>
Thu, 25 May 2023 03:55:43 +0000 (21:55 -0600)
committerEric Branlund <ebranlund@fastmail.com>
Thu, 25 May 2023 03:55:43 +0000 (21:55 -0600)
1  2 
src/Makefile.am patch | diff1 | diff2 | blob | history
src/main/angband-initializer.cpp patch | diff1 | diff2 | blob | history

diff --cc src/Makefile.am
Simple merge
diff --cc src/main/angband-initializer.cpp
Simple merge
The master and develop branches track hengband.
About OSDN
Find Software
Develop Software
Help