]> granicus.if.org Git - nethack/commitdiff
projects / nethack / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b2a1d14 af54125)
Merge branch 'master' into win32-x64-working
authornhmall <mjnh@persona.ca>
Fri, 12 Jun 2015 02:24:42 +0000 (22:24 -0400)
committernhmall <mjnh@persona.ca>
Fri, 12 Jun 2015 02:24:42 +0000 (22:24 -0400)
Conflicts:
src/options.c

1  2 
src/options.c patch | diff1 | diff2 | blob | history

diff --cc src/options.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.