git.osdn.net Git - hengbandforosx/hengbandosx.git/commit

(root) / hengbandforosx / hengbandosx.git / commit

author	Eric Branlund <ebranlund@fastmail.com>
	Mon, 17 Feb 2020 05:52:23 +0000 (21:52 -0800)
committer	Eric Branlund <ebranlund@fastmail.com>
	Mon, 17 Feb 2020 05:52:23 +0000 (21:52 -0800)
commit	1f88e200c0d5f65fc7a8fe0a4cdc06b6f2fbd894
tree	ae600e05f19316f82914246255518fc6499716ae	tree \| snapshot
parent	6d7e9c29f7c7efc2e12eac25557657793dd6e42a	commit \| diff
parent	b6b861d781dd5738cd7d9617ff77e99bfdbf048c	commit \| diff

Merge branch 'master' of git://git.osdn.net/gitroot/hengband/hengband . Used upstream's of two arguments to init_file_paths() but kept the implementation similar to what was used in the OS X port (don't modify the incoming arguments so declare them as concptr).

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
lib/xtra/graf/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/externs.h	diff1 \|	diff2 \|	blob \| history
src/init2.c	diff1 \|	diff2 \|	blob \| history
src/main-cocoa.m	diff1 \|	\|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/z-config.h	diff1 \|	diff2 \|	blob \| history

The master and develop branches track hengband.

RSS Atom

About OSDN

Find Software

Develop Software

Help

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
lib/xtra/graf/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/externs.h	diff1 \|	diff2 \|	blob \| history
src/init2.c	diff1 \|	diff2 \|	blob \| history
src/main-cocoa.m	diff1 \|	\|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/z-config.h	diff1 \|	diff2 \|	blob \| history