OSDN Git Service

Merge remote-tracking branch 'remotes/origin/MERFOLK'
authorDeskull <deskull@users.sourceforge.jp>
Mon, 14 Jan 2019 12:46:46 +0000 (21:46 +0900)
committerDeskull <deskull@users.sourceforge.jp>
Mon, 14 Jan 2019 12:46:46 +0000 (21:46 +0900)
commit9b6497cb053839e0b632be11ab666474c4780a1e
tree13e9af7622fb6385e3c9593f21c3d037a74f2d02
parentbdff90555677c6cbc63fa9ae6470d10f3450fded
parentde9eaeda62bd461095cbcad69f0a1b0c04e99f0a
Merge remote-tracking branch 'remotes/origin/MERFOLK'

# Conflicts:
# src/cmd-pet.c
# src/cmd1.c
src/birth.c
src/cmd-pet.c
src/cmd1.c
src/defines.h
src/dungeon.c
src/init1.c
src/spells1.c
src/tables.c
src/types.h
src/xtra1.c