]> granicus.if.org Git - nethack/commitdiff
Merge branch 'master' into win32-x64-working
authornhmall <mjnh@persona.ca>
Fri, 1 May 2015 22:36:39 +0000 (18:36 -0400)
committernhmall <mjnh@persona.ca>
Fri, 1 May 2015 22:36:39 +0000 (18:36 -0400)
1  2 
include/extern.h
src/options.c

Simple merge
diff --cc src/options.c
Simple merge