OSDN Git Service

(root) / hengbandforosx / hengbandosx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46b7856 6b04902)
Merge branch 'develop' of github.com:hengband/hengband into macos-develop vauto3.0.1-alpha1-6aa0ca768
authorEric Branlund <ebranlund@fastmail.com>
Mon, 13 Nov 2023 21:49:18 +0000 (14:49 -0700)
committerEric Branlund <ebranlund@fastmail.com>
Mon, 13 Nov 2023 21:49:18 +0000 (14:49 -0700)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
lib/edit/quests/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc lib/edit/quests/Makefile.am
Simple merge
The master and develop branches track hengband.
About OSDN
Find Software
Develop Software
Help