]> granicus.if.org Git - nethack/commitdiff
Merge branch 'master' into status_hilite
authornhmall <mjnh@persona.ca>
Mon, 1 Jun 2015 13:09:44 +0000 (09:09 -0400)
committernhmall <mjnh@persona.ca>
Mon, 1 Jun 2015 13:09:44 +0000 (09:09 -0400)
Conflicts:
include/extern.h
src/options.c

1  2 
include/extern.h
src/options.c

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