git.osdn.net Git - hengband/hengband.git/commit

(root) / hengband / hengband.git / commit

author	deskull <deskull@users.sourceforge.jp>
	Sun, 23 Aug 2020 15:46:00 +0000 (00:46 +0900)
committer	deskull <deskull@users.sourceforge.jp>
	Sun, 23 Aug 2020 15:46:00 +0000 (00:46 +0900)
commit	17271bf765258adace6a5ec0d6b75c461f39bae2
tree	73039946bbdf70df0319c76d1fb3ddd4f0cf8a3b	tree \| snapshot
parent	ef43e5d325d13d7e98632b7e9284c45deddf71ff	commit \| diff
parent	b6b861d781dd5738cd7d9617ff77e99bfdbf048c	commit \| diff

Merge branch 'master' of git.osdn.net:/gitroot/hengband/hengband

# Conflicts:
# configure.ac
# src/Makefile.am
# src/autopick.c
# src/cmd-smith.c
# src/externs.h
# src/init2.c
# src/main-mac.c
# src/main-win.c
# src/monster1.c
# src/z-config.h

.gitignore	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
lib/edit/Makefile.am	diff1 \|	diff2 \|	blob \| history
lib/file/Makefile.am	diff1 \|	diff2 \|	blob \| history
lib/help/Makefile.am	diff1 \|	diff2 \|	blob \| history
lib/pref/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/main-win.c	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history

変愚蛮怒のメインリポジトリです

RSS Atom

About OSDN

Find Software

Develop Software

Help

.gitignore	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
lib/edit/Makefile.am	diff1 \|	diff2 \|	blob \| history
lib/file/Makefile.am	diff1 \|	diff2 \|	blob \| history
lib/help/Makefile.am	diff1 \|	diff2 \|	blob \| history
lib/pref/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/main-win.c	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history