]> granicus.if.org Git - nethack/commit
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)
commit017e82683771f0bd96f196d5ae397f1b60e72b0f
tree415982478f9749e8a880e0159ec63b5fb110e622
parentb2a1d142ab6b6fefb63c046aba6807dd4e67d724
parentaf54125c2202286970915cfad1192a8ba11fe092
Merge branch 'master' into win32-x64-working

Conflicts:
src/options.c
src/options.c