OSDN Git Service

(root) / hengbandforosx / hengbandosx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3720ca3 f551e50)
Merge branch 'For2.2.2-Refactoring' into For2.2.2-Refactoring-Cocoa2
authorEric Branlund <ebranlund@fastmail.com>
Fri, 14 Aug 2020 22:43:02 +0000 (15:43 -0700)
committerEric Branlund <ebranlund@fastmail.com>
Fri, 14 Aug 2020 22:43:02 +0000 (15:43 -0700)
1  2 
src/Makefile.am patch | diff1 | diff2 | blob | history
src/main-win.c patch | diff1 | diff2 | blob | history

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