housekeeping for 3.6.1

Changes to be committed: modified: Files modified: README modified: dat/history modified: doc/Guidebook.mn modified: doc/Guidebook.tex modified: include/global.h modified: include/obj.h modified: include/patchlevel.h modified: src/invent.c modified: src/objnam.c modified: src/shknam.c modified: src/sounds.c modified: src/spell.c modified: sys/winnt/Install.nt modified: sys/winnt/nethack.def modified: win/macosx/NetHackGuidebook.applescript modified: win/macosx/NetHackTerm.applescript modified: win/win32/mswproc.c
2015-12-16 17:52:34 -05:00
parent 929be769ec
commit fa092f5fe9
18 changed files with 90 additions and 65 deletions
--- a/28
+++ b/28
@@ -86,7 +86,7 @@ wield.c         windows.c       wizard.c        worm.c          worn.c
 write.c         zap.c

 sys/amiga:
-(files for Amiga versions - untested for 3.6.0)
+(files for Amiga versions - untested for 3.6.1)
 Build.ami       Install.ami     Makefile.agc    Makefile.ami    NetHack.cnf
 amidos.c        amidos.p        amifont.uu      amifont8.uu     amigst.c
 amii.hlp        amimenu.c       amirip.c        amisnd.c        amistack.c
@@ -97,12 +97,12 @@ winfuncs.c      winkey.c        winmenu.c       winproto.h      winreq.c
 winstr.c        xpm2iff.c

 sys/atari:
-(files for Atari version - untested for 3.6.0)
+(files for Atari version - untested for 3.6.1)
 Install.tos     atarifnt.uue    nethack.mnu     setup.g         tos.c
 unx2atar.sed

 sys/be:
-(files for BeOS version - untested for 3.6.0)
+(files for BeOS version - untested for 3.6.1)
 README          bemain.c

 sys/mac:
@@ -115,7 +115,7 @@ macwin.c        mgetline.c      mmodal.c        mrecover.c      mrecover.hqx
 mttymain.c

 sys/msdos:
-(files for MSDOS version - untested for 3.6.0)
+(files for MSDOS version - untested for 3.6.1)
 Install.dos     Makefile.BC     Makefile.GCC    Makefile.MSC    moveinit.pat
 msdos.c         msdoshlp.txt    ovlinit.c       pckeys.c        pctiles.c
 pctiles.h       pcvideo.h       portio.h        schema1.BC      schema2.BC
@@ -125,17 +125,17 @@ video.c         vidtxt.c        vidvga.c
 nhico.uu        nhpif.uu

 sys/os2:
-(files for OS/2 version - untested for 3.6.0)
+(files for OS/2 version - untested for 3.6.1)
 Install.os2     Makefile.os2    nhpmico.uu      os2.c

 sys/share:
-(files for MSDOS and OS/2 versions - untested for 3.6.0)
+(files for MSDOS and OS/2 versions - untested for 3.6.1)
 Makefile.lib    termcap.uu
-(file for MSDOS, OS/2, NT, Amiga, and Atari versions - untested for 3.6.0)
+(file for MSDOS, OS/2, NT, Amiga, and Atari versions - untested for 3.6.1)
 pcmain.c
-(files for MSDOS, OS/2, NT, and Atari versions - untested for 3.6.0)
+(files for MSDOS, OS/2, NT, and Atari versions - untested for 3.6.1)
 pcsys.c         pcunix.c
-(file for MSDOS, OS/2, and Atari versions - untested for 3.6.0)
+(file for MSDOS, OS/2, and Atari versions - untested for 3.6.1)
 NetHack.cnf     pctty.c
 (files for UNIX and Be versions)
 ioctl.c         unixtty.c
@@ -189,7 +189,7 @@ spec_lev.com    sysconf         vmsbuild.com    vmsfiles.c      vmsmail.c
 vmsmain.c       vmsmisc.c       vmstty.c        vmsunix.c

 sys/wince:
-(files for Windows CE and PocketPC - untested for 3.6.0)
+(files for Windows CE and PocketPC - untested for 3.6.1)
 Install.ce      bootstrp.mak    celib.c         cesetup.bat     cesound.c
 defaults.nh     keypad.uu       menubar.uu      mhaskyn.c       mhaskyn.h
 mhcmd.c         mhcmd.h         mhcolor.c       mhcolor.h       mhdlg.c
@@ -202,11 +202,11 @@ resource.h      winMS.h         winhack.c       winhack.rc      winhcksp.rc
 winmain.c

 sys/wince/ceinc:
-(header files for Windows CE and PocketPC - untested for 3.6.0)
+(header files for Windows CE and PocketPC - untested for 3.6.1)
 assert.h        errno.h         fcntl.h

 sys/wince/ceinc/sys:
-(sys/stat.h for Windows CE and PocketPC - untested for 3.6.0)
+(sys/stat.h for Windows CE and PocketPC - untested for 3.6.1)
 stat.h

 sys/winnt:
@@ -242,13 +242,13 @@ win/chain:
 wc_chainin.c    wc_chainout.c   wc_trace.c

 win/gem:
-(files for GEM versions - untested for 3.6.0)
+(files for GEM versions - untested for 3.6.1)
 Install.gem     bitmfile.c      gem_rsc.uu      gem_rso.uu      gr_rect.c
 gr_rect.h       load_img.c      tile2img.c      title.uu        wingem.c
 wingem1.c       xpm2img.c

 win/gnome:
-(files for GNOME versions - untested for 3.6.0)
+(files for GNOME versions - untested for 3.6.1)
 README          gn_xpms.h       gnaskstr.c      gnaskstr.h      gnbind.c
 gnbind.h        gnglyph.c       gnglyph.h       gnmain.c        gnmain.h
 gnmap.c         gnmap.h         gnmenu.c        gnmenu.h        gnmesg.c
--- a/6
+++ b/6
@@ -1,13 +1,13 @@
-                NetHack 3.6.0 -- General information
+                NetHack 3.6.1 -- General information

 NetHack 3.6 is an enhancement to the dungeon exploration game NetHack.
 It is a distant descendent of Rogue and Hack, and a direct descendent of
 NetHack 3.4. In order to avoid confusion with interim development code 
 that was posted online in 2014 by others, there is no NetHack 3.5 release.

-NetHack 3.6.0 contains some code reorganization, new features, and bugfixes.
+NetHack 3.6.1 contains several dozen bugfixes.

-The file doc/fixes36.0 in the source distribution has a full list of each. 
+The file doc/fixes36.1 in the source distribution has a full list of each. 
 The text in there was written for the development team's own use and is 
 provided "as is", so please do not ask us to further explain the entries 
 in that file. Some entries might be considered "spoilers", particularly
--- a/dat/history
+++ b/dat/history
@@ -184,25 +184,30 @@ with some of the beloved community patches.  Many bugs were fixed and some
 code was restructured.

 The development team, as well as Steve VanDevender and Kevin Smolkowski
-ensured that NetHack 3.6.0 continued to operate on various Unix flavors
+ensured that NetHack 3.6 continued to operate on various Unix flavors
 as well as maintaining the X11 interface.

 Ken Lorber, Haoyang Wang, Pat Rankin, and Dean Luick maintained the port
-of NetHack 3.6.0 for Mac.
+of NetHack 3.6 for Mac.

 Michael Allison, Derek S. Ray, Yitzhak Sapir, Alex Kompel, Dion Nicolaas,
-and David Cohrs maintained the port of NetHack 3.6.0 for Microsoft Windows.
+and David Cohrs maintained the port of NetHack 3.6 for Microsoft Windows.

-Pat Rankin attempted to keep the VMS port running for NetHack 3.6.0,
+Pat Rankin attempted to keep the VMS port running for NetHack 3.6,
 hindered by limited access.  Kevin Smolkowski has updated and tested it
 for the most recent version of OpenVMS (V8.4 as of this writing) on Alpha
 and Integrity (aka Itanium aka IA64) but not VAX.

-This version of the game is special in a particular way.  Near the end of
-the development of 3.6, one of the significant inspirations for many of
+The 3.6 version of the game is special in a particular way.  Near the end of
+the development of 3.6.0, one of the significant inspirations for many of
 the humorous and fun features found in the game, author Terry Pratchett,
-passed away.  This version of the game includes a tribute to him.
+passed away.  The 3.6 version of the game includes a tribute to him.

+The 3.6 development team consisting of Michael Allison, Warwick Allison, 
+Ken Arromdee, David Cohrs, Jessie Collet, Sean Hunt, Pasi Kallinen, 
+Ken Lorber, Dean Luick, Pat Rankin, Derek Ray, Mike Stephenson, 
+Janet Walz,  and Paul Winner released 3.6.1 as a bug fix release in 
+January 2016.

 An official NetHack web site continues to be maintained by Ken Lorber at
 http://www.nethack.org/.
--- a/doc/Guidebook.mn
+++ b/doc/Guidebook.mn
@@ -1,11 +1,11 @@
-.\" $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.189 $ $NHDT-Date: 1450187428 2015/12/15 13:50:28 $
+.\" $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.191 $ $NHDT-Date: 1450306152 2015/12/16 22:49:12 $
 .ds h0 "NetHack Guidebook
 .ds h1
 .ds h2 %
 .ds vr "NetHack 3.6
 .ds f0 "\*(vr
 .ds f1
-.ds f2 "December 15, 2015
+.ds f2 "December 16, 2015
 .\" labeled paragraph start (should be part of tmac.n, but I don't want to
 .\" make changes to that file)
 .\" .PS word
@@ -3485,15 +3485,22 @@ with some of the beloved community patches. Many bugs were fixed and a
 large amount of code was restructured.
 .pg
 \fBThe development team, as well as \fBSteve VanDevender\fP and 
-\fBKevin Smolkowski\fP ensured that NetHack 3.6.0 continued to operate on 
+\fBKevin Smolkowski\fP ensured that NetHack 3.6 continued to operate on 
 various Unix flavors and maintained the X11 interface. 
 .pg
 \fBKen Lorber\fP, \fBHaoyang Wang\fP, \fBPat Rankin\fP, and \fBDean Luick\fP 
-maintained the port of NetHack 3.6.0 for Mac.
+maintained the port of NetHack 3.6 for Mac.
 .pg
 \fBMichael Allison\fP, \fBDerek S. Ray\fP, \fBYitzhak Sapir\fP, 
 \fBAlex Kompel\fP, and \fBDion Nicolaas\fP maintained the port of 
-NetHack 3.6.0 for Microsoft Windows.
+NetHack 3.6 for Microsoft Windows.
+.pg
+The 3.6 development team consisting of
+\fBMichael Allison\fP, \fBWarwick Allison\fP, \fBKen Arromdee\fP,
+\fBDavid Cohrs\fP, \fBJessie Collet\fP, \fBSean Hunt\fP, 
+\fBPasi Kallinen\fP, \fBKen Lorber\fP, \fBDean Luick\fP, \fBPat Rankin\fP, 
+\fBMike Stephenson\fP, \fBDerek S. Ray\fP, \fBJanet Walz\fP, and \fBPaul Winner\fP
+released 3.6.1 as a bug fix release in January 2016.
 .pg
 The official NetHack web site is maintained by \fBKen Lorber\fP at http://www.nethack.org/.
 .pg
--- a/doc/Guidebook.tex
+++ b/doc/Guidebook.tex
@@ -1,5 +1,5 @@
 \documentstyle[titlepage,longtable]{article}
-% NetHack 3.6  Guidebook.tex $NHDT-Date: 1431192762 2015/05/09 17:32:42 $  $NHDT-Branch: master $:$NHDT-Revision: 1.60 $ */
+% NetHack 3.6  Guidebook.tex $NHDT-Date: 1431192762 2015/12/16 17:32:42 $  $NHDT-Branch: master $:$NHDT-Revision: 1.60 $ */
 %+% we're still limping along in LaTeX 2.09 compatibility mode
 %-%\documentclass{article}
 %-%\usepackage{hyperref} % before longtable
@@ -45,7 +45,7 @@
 %.au
 \author{Original version - Eric S. Raymond\\
 (Edited and expanded for 3.6 by Mike Stephenson and others)}
-\date{December 15, 2015}
+\date{December 16, 2015}

 \maketitle

@@ -4185,22 +4185,30 @@ version merges work done by the development team since the previous release
 with some of the beloved community patches. Many bugs were fixed and a 
 large amount of code was restructured.

-
 %.pg
 \medskip
 The development team, as well as {\it Steve VanDevender} and 
-{\it Kevin Smolkowski} ensured that NetHack 3.6.0 continued to operate on 
+{\it Kevin Smolkowski} ensured that NetHack 3.6 continued to operate on 
 various Unix flavors and maintained the X11 interface. 

 %.pg
 {\it Ken Lorber}, {\it Haoyang Wang}, {\it Pat Rankin}, and {\it Dean Luick} 
-maintained the port of NetHack 3.6.0 for Mac.
+maintained the port of NetHack 3.6 for Mac.

 %.pg
 \medskip
 {\it Michael Allison}, {\it Derek S. Ray}, {\it Yitzhak Sapir}, 
 {\it Alex Kompel}, and {\it Dion Nicolaas} maintained the port of 
-NetHack 3.6.0 for Microsoft Windows.
+NetHack 3.6 for Microsoft Windows.
+
+%.pg
+\medskip
+The 3.6 development team consisting of
+{\it Michael Allison}, {\it Warwick Allison}, {\it Ken Arromdee},
+{\it David Cohrs}, {\it Jessie Collet}, {\it Sean Hunt}, 
+{\it Pasi Kallinen}, {\it Ken Lorber}, {\it Dean Luick}, {\it Pat Rankin}, 
+{\it Mike Stephenson}, {\it Derek S. Ray}, {\it Janet Walz}, and {\it Paul Winner}
+released 3.6.1 as a bug fix release in January 2016.

 %.pg
 \medskip
--- a/include/global.h
+++ b/include/global.h
@@ -1,4 +1,4 @@
-/* NetHack 3.6	global.h	$NHDT-Date: 1449116298 2015/12/03 04:18:18 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.46 $ */
+/* NetHack 3.6	global.h	$NHDT-Date: 1450306170 2015/12/16 22:49:30 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.47 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -7,9 +7,9 @@

 #include <stdio.h>

-/* #define BETA */ /* development or beta testing [MRS] */
+#define BETA  /* development or beta testing [MRS] */

-/* #define DEBUG */
+#define DEBUG 

 /*
 * Files expected to exist in the playground directory.
--- a/include/obj.h
+++ b/include/obj.h
@@ -1,4 +1,4 @@
-/* NetHack 3.6	obj.h	$NHDT-Date: 1445126423 2015/10/18 00:00:23 $  $NHDT-Branch: master $:$NHDT-Revision: 1.50 $ */
+/* NetHack 3.6	obj.h	$NHDT-Date: 1450306176 2015/12/16 22:49:36 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.51 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -111,7 +111,7 @@ struct obj {
    int corpsenm;         /* type of corpse is mons[corpsenm] */
 #define leashmon corpsenm /* gets m_id of attached pet */
 #define fromsink corpsenm /* a potion from a sink */
-#define novelidx corpsenm /* 3.6.0 tribute - the index of the novel title */
+#define novelidx corpsenm /* 3.6 tribute - the index of the novel title */
 #define record_achieve_special corpsenm
    int usecount;           /* overloaded for various things that tally */
 #define spestudied usecount /* # of times a spellbook has been studied */
--- a/include/patchlevel.h
+++ b/include/patchlevel.h
@@ -1,19 +1,19 @@
-/* NetHack 3.6	patchlevel.h	$NHDT-Date: 1447755971 2015/11/17 10:26:11 $  $NHDT-Branch: master $:$NHDT-Revision: 1.112 $ */
+/* NetHack 3.6	patchlevel.h	$NHDT-Date: 1450306182 2015/12/16 22:49:42 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.114 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

-/* NetHack 3.6.0 */
+/* NetHack 3.6.1 */
 #define VERSION_MAJOR 3
 #define VERSION_MINOR 6
 /*
 * PATCHLEVEL is updated for each release.
 */
-#define PATCHLEVEL 0
+#define PATCHLEVEL 1
 /*
 * Incrementing EDITLEVEL can be used to force invalidation of old bones
 * and save files.
 */
-#define EDITLEVEL 2
+#define EDITLEVEL 0

 #define COPYRIGHT_BANNER_A "NetHack, Copyright 1985-2015"
 #define COPYRIGHT_BANNER_B \
@@ -30,11 +30,16 @@
 * PP = patch level, ee = edit level, L = literal suffix "L",
 * with all four numbers specified as two hexadecimal digits.
 */
-/* #define VERSION_COMPATIBILITY 0x03050000L */
+#define VERSION_COMPATIBILITY 0x03060000L

 /****************************************************************************/
 /* Version 3.6.x */

+/*  Patch 1, [insert date here]
+ *  A couple of dozen bug fixes.
+ *  
+ */
+
 /*
 *  NetHack 3.6.0, December 7, 2015
 *
--- a/src/invent.c
+++ b/src/invent.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	invent.c	$NHDT-Date: 1447576348 2015/11/15 08:32:28 $  $NHDT-Branch: master $:$NHDT-Revision: 1.179 $ */
+/* NetHack 3.6	invent.c	$NHDT-Date: 1450306195 2015/12/16 22:49:55 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.180 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -820,7 +820,7 @@ have_lizard()
    return FALSE;
 }

-/* 3.6.0 tribute */
+/* 3.6 tribute */
 struct obj *
 u_have_novel()
 {
--- a/src/objnam.c
+++ b/src/objnam.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	objnam.c	$NHDT-Date: 1450261364 2015/12/16 10:22:44 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.157 $ */
+/* NetHack 3.6	objnam.c	$NHDT-Date: 1450306207 2015/12/16 22:50:07 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.158 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -3479,7 +3479,7 @@ typfnd:
        if (aname && objtyp == otmp->otyp)
            name = aname;

-        /* 3.6.0 tribute - fix up novel */
+        /* 3.6 tribute - fix up novel */
        if (otmp->otyp == SPE_NOVEL) {
            const char *novelname;

--- a/src/shknam.c
+++ b/src/shknam.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	shknam.c	$NHDT-Date: 1448094342 2015/11/21 08:25:42 $  $NHDT-Branch: master $:$NHDT-Revision: 1.38 $ */
+/* NetHack 3.6	shknam.c	$NHDT-Date: 1450306213 2015/12/16 22:50:13 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.39 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -454,7 +454,7 @@ boolean mkspecl;
    struct permonst *ptr;
    int atype;

-    /* 3.6.0 tribute */
+    /* 3.6 tribute */
    if (mkspecl && (!strcmp(shp->name, "rare books")
                    || !strcmp(shp->name, "second-hand bookstore"))) {
        struct obj *novel = mksobj_at(SPE_NOVEL, sx, sy, FALSE, FALSE);
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	sounds.c	$NHDT-Date: 1446713641 2015/11/05 08:54:01 $  $NHDT-Branch: master $:$NHDT-Revision: 1.74 $ */
+/* NetHack 3.6	sounds.c	$NHDT-Date: 1450306219 2015/12/16 22:50:19 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.75 $ */
 /*      Copyright (c) 1989 Janet Walz, Mike Threepoint */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -908,7 +908,7 @@ register struct monst *mtmp;
        break;
    }
    case MS_RIDER:
-        /* 3.6.0 tribute */
+        /* 3.6 tribute */
        if (ptr == &mons[PM_DEATH]
            && !context.tribute.Deathnotice && u_have_novel()) {
            struct obj *book = u_have_novel();
--- a/src/spell.c
+++ b/src/spell.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	spell.c	$NHDT-Date: 1450128440 2015/12/14 21:27:20 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.73 $ */
+/* NetHack 3.6	spell.c	$NHDT-Date: 1450306224 2015/12/16 22:50:24 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.74 $ */
 /*      Copyright (c) M. Stephenson 1988                          */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -465,7 +465,7 @@ register struct obj *spellbook;
            return 1;
        }

-        /* 3.6.0 tribute */
+        /* 3.6 tribute */
        if (booktype == SPE_NOVEL) {
            /* Obtain current Terry Pratchett book title */
            const char *tribtitle = noveltitle(&spellbook->novelidx);
--- a/sys/winnt/Install.nt
+++ b/sys/winnt/Install.nt
@@ -5,7 +5,7 @@
                       NetHack 3.6 on a Windows system
         (Windows 7/8.x/10 or later only. XP may work but is untested)
         ==============================================================
-          Last revision: $NHDT-Date: 1447979773 2015/11/20 00:36:13 $
+          Last revision: $NHDT-Date: 1450306349 2015/12/16 22:52:29 $

 Credit for the porting of NetHack to the Win32 Console Subsystem goes to 
 the NT Porting Team started by Michael Allison.
@@ -16,7 +16,7 @@ contributed the port.

 The PC Windows porting team consisting of Michael Allison, David Cohrs, 
 Alex Kompel, Dion Nicolaas, Yitzhak Sapir, and Janet Walz maintained the 
-tty and graphical win32 versions of NetHack 3.6.0.
+tty and graphical win32 versions of NetHack 3.6.1.

 You can build a TTY version of NetHack and a Windows Graphical 
 version.  You can use one of the following build environments:
@@ -90,7 +90,7 @@ a 32-bit x86 version, or a 64-bit x64 version.  The default Makefile
 is set up for a 32-bit x86 version, but that's only because it will 
 run on the most number of existing Windows environments.

-NetHack's save files and bones files in the 3.6.0 release have not 
+NetHack's save files and bones files in the 3.6.1 release have not 
 evolved enough to allow them to interchange between the 32-bit version 
 and the 64-bit version (or between different platforms). Hopefully
 that will change in an upcoming release.
@@ -508,10 +508,10 @@ II. Executing the game
    If you will be running it by launching it from a shortcut, just use
    the following information when setting up the shortcut.

-        Description      :  NetHack 3.6.0 Console version
+        Description      :  NetHack 3.6.1 Console version
        Command Line     :  C:\NETHACK\BINARY\NETHACK.EXE

-        Description      :  NetHack 3.6.0 Graphical Interface
+        Description      :  NetHack 3.6.1 Graphical Interface
         Command Line     :  C:\NETHACK\BINARY\NETHACKW.EXE

   (changing the directory to the appropriate one of course)
--- a/sys/winnt/nethack.def
+++ b/sys/winnt/nethack.def
@@ -1,5 +1,5 @@
 NAME		NETHACK
-DESCRIPTION	'NetHack 3.6.0 for Windows NT'
+DESCRIPTION	'NetHack 3.6.1 for Windows NT'
 EXETYPE		WINDOWS
 STUB		'WINSTUB.EXE'
 CODE		PRELOAD MOVEABLE DISCARDABLE
--- a/win/macosx/NetHackGuidebook.applescript
+++ b/win/macosx/NetHackGuidebook.applescript
@@ -1,5 +1,5 @@
 #!/usr/bin/osascript
-# NetHack 3.6.0  NetHackGuidebook.applescript $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.6.1  NetHackGuidebook.applescript $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2011
 # NetHack may be freely redistributed.  See license for details.

--- a/win/macosx/NetHackTerm.applescript
+++ b/win/macosx/NetHackTerm.applescript
@@ -1,5 +1,5 @@
 #!/usr/bin/osascript
-# NetHack 3.6.0  NetHackTerm.applescript $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.6.1  NetHackTerm.applescript $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2011
 # NetHack may be freely redistributed.  See license for details.

--- a/win/win32/mswproc.c
+++ b/win/win32/mswproc.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	mswproc.c	$NHDT-Date: 1449751720 2015/12/10 12:48:40 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.95 $ */
+/* NetHack 3.6	mswproc.c	$NHDT-Date: 1450306253 2015/12/16 22:50:53 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.96 $ */
 /* Copyright (C) 2001 by Alex Kompel 	 */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -2222,7 +2222,7 @@ logDebug(const char *fmt, ...)
 /* Reading and writing settings from the registry. */
 #define CATEGORYKEY "Software"
 #define COMPANYKEY "NetHack"
-#define PRODUCTKEY "NetHack 3.6.0"
+#define PRODUCTKEY "NetHack 3.6.1"
 #define SETTINGSKEY "Settings"
 #define MAINSHOWSTATEKEY "MainShowState"
 #define MAINMINXKEY "MainMinX"