]> granicus.if.org Git - nethack/commit
Merge branch 'win-minor' into win-fontmap
authorBart House <bart@barthouse.com>
Sun, 9 Dec 2018 22:02:57 +0000 (14:02 -0800)
committerBart House <bart@barthouse.com>
Sun, 9 Dec 2018 22:02:57 +0000 (14:02 -0800)
commita8d5f49837bdf9d30bceaf99e0e0ce594358dc61
tree1a77b8c079d0828e4555a125166478bbf31e57c5
parentfccc3cbee663cafdd46c57070ba4a6f3cab5410c
parent88bbf781d146c022ecad1790b01e85bbb4ba0958
Merge branch 'win-minor' into win-fontmap

# Conflicts:
# win/win32/mhmap.c
win/win32/mhmap.c