granicus.if.org Git - nethack/commit

]> granicus.if.org Git - nethack/commit

projects / nethack / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3d5415b 5828d17)

author	nhmall <mjnh@persona.ca>
	Sat, 25 Apr 2015 12:58:59 +0000 (08:58 -0400)
committer	nhmall <mjnh@persona.ca>
	Sat, 25 Apr 2015 12:58:59 +0000 (08:58 -0400)
commit	a717d06ce4d359bf5196244b7844ea9c52fabfc8
tree	25d35b7043e53f4a7070922cf376d20eb87d44b1	tree \| snapshot
parent	3d5415b33a2ecaaa8f8e76939976beb7fe8374f2	commit \| diff
parent	5828d17eef4dcad18d037f48b75d63c3b0d6a371	commit \| diff

Merge branch 'master' into win32-x64-working

Conflicts:
src/end.c
src/files.c
src/options.c

src/do_name.c	diff1 \|	diff2 \|	blob \| history
src/end.c	diff1 \|	diff2 \|	blob \| history
src/files.c	diff1 \|	diff2 \|	blob \| history
src/mklev.c	diff1 \|	diff2 \|	blob \| history
src/options.c	diff1 \|	diff2 \|	blob \| history
src/shk.c	diff1 \|	diff2 \|	blob \| history
src/zap.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.