Manually fix botched NHDT-Branch expansions.

diff --git a/include/config.h b/include/config.h
index c13b2dd01d4f698cb8acad5d313e8e19f77660c6..d8b067fc75cd5ee545cc186bc65d6cbe9547fe45 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -1,4 +1,4 @@
-/* NetHack 3.5 config.h        $NHDT-Date: 1425083082 2015/02/28 00:24:42 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.51 $ */
+/* NetHack 3.5 config.h        $NHDT-Date: 1425083082 2015/02/28 00:24:42 $  $NHDT-Branch: master $:$NHDT-Revision: 1.51 $ */
 /* NetHack 3.5 config.h        $Date: 2012/01/27 20:15:26 $  $Revision: 1.37 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

diff --git a/include/decl.h b/include/decl.h
index f9d4a7b7c56ad21e2f8572e8c64e21cdd26e4505..4591226e49e96502bc6e54dfeb0925e4bc21d3a8 100644 (file)
--- a/include/decl.h
+++ b/include/decl.h
@@ -1,4 +1,4 @@
-/* NetHack 3.5 decl.h  $NHDT-Date: 1425081976 2015/02/28 00:06:16 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.50 $ */
+/* NetHack 3.5 decl.h  $NHDT-Date: 1425081976 2015/02/28 00:06:16 $  $NHDT-Branch: master $:$NHDT-Revision: 1.50 $ */
 /* NetHack 3.5 decl.h  $Date: 2011/12/29 20:06:27 $  $Revision: 1.44 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

diff --git a/include/extern.h b/include/extern.h
index 39a42641c83a6e95abdbdbd67befee8a6e086668..cdeee5478ad469a1beece23c069adffa37ee85d9 100644 (file)
--- a/include/extern.h
+++ b/include/extern.h
@@ -1,4 +1,4 @@
-/* NetHack 3.5 extern.h        $NHDT-Date: 1425081976 2015/02/28 00:06:16 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.390 $ */
+/* NetHack 3.5 extern.h        $NHDT-Date: 1425081976 2015/02/28 00:06:16 $  $NHDT-Branch: master $:$NHDT-Revision: 1.390 $ */
 /* NetHack 3.5 extern.h        $Date: 2013/11/05 00:57:53 $  $Revision: 1.380 $ */
 /* Copyright (c) Steve Creps, 1988.                              */
 /* NetHack may be freely redistributed.  See license for details. */

diff --git a/include/flag.h b/include/flag.h
index de2b63e84d5bbe79f88097eb986d740803c2d7e5..a34abe83949924f3807f37050552083ce1904e00 100644 (file)
--- a/include/flag.h
+++ b/include/flag.h
@@ -1,4 +1,4 @@
-/* NetHack 3.5 flag.h  $NHDT-Date: 1425081976 2015/02/28 00:06:16 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.60 $ */
+/* NetHack 3.5 flag.h  $NHDT-Date: 1425081976 2015/02/28 00:06:16 $  $NHDT-Branch: master $:$NHDT-Revision: 1.60 $ */
 /* NetHack 3.5 flag.h  $Date: 2012/04/09 02:56:32 $  $Revision: 1.59 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

diff --git a/include/wceconf.h b/include/wceconf.h
index 52ad4d1f187fe7f1b406930e44690e716140c406..d2d11d40435229969f52930e550dde393362e326 100644 (file)
--- a/include/wceconf.h
+++ b/include/wceconf.h
@@ -1,4 +1,4 @@
-/* NetHack 3.5 wceconf.h       $NHDT-Date: 1425081976 2015/02/28 00:06:16 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.12 $ */
+/* NetHack 3.5 wceconf.h       $NHDT-Date: 1425081976 2015/02/28 00:06:16 $  $NHDT-Branch: master $:$NHDT-Revision: 1.12 $ */
 /* NetHack 3.5 wceconf.h       $Date: 2009/10/22 02:59:14 $  $Revision: 1.12 $ */
 /* Copyright (C) 2001 by Alex Kompel    */
 /* NetHack may be freely redistributed.  See license for details. */

diff --git a/src/botl.c b/src/botl.c
index 76d16a8ff3d8f2004b6a7d9bd6ee62cac2e72812..6006df8ce5b7ab90cc5f021dbd5a6bc52a851de4 100644 (file)
--- a/src/botl.c
+++ b/src/botl.c
@@ -1,4 +1,4 @@
-/* NetHack 3.5 botl.c  $NHDT-Date: 1425083082 2015/02/28 00:24:42 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.38 $ */
+/* NetHack 3.5 botl.c  $NHDT-Date: 1425083082 2015/02/28 00:24:42 $  $NHDT-Branch: master $:$NHDT-Revision: 1.38 $ */
 /* NetHack 3.5 botl.c  $Date: 2012/01/10 17:47:19 $  $Revision: 1.36 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

diff --git a/src/files.c b/src/files.c
index 7ba1805476d14073a87a4dc0705a278ed4e43c55..71fd0c21730b265a6b425c2e3225db348bdbb51f 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -1,4 +1,4 @@
-/* NetHack 3.5 files.c $NHDT-Date: 1425081976 2015/02/28 00:06:16 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.127 $ */
+/* NetHack 3.5 files.c $NHDT-Date: 1425081976 2015/02/28 00:06:16 $  $NHDT-Branch: master $:$NHDT-Revision: 1.127 $ */
 /* NetHack 3.5 files.c $Date: 2012/03/10 02:49:08 $  $Revision: 1.124 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

diff --git a/src/options.c b/src/options.c
index 1c63c5ed5e16b8c7b5c79c4df2ea4a89796c9948..54ad99efc708d44b0d9cfc0b2eeb0a6ece644641 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -1,4 +1,4 @@
-/* NetHack 3.5 options.c       $NHDT-Date: 1425083082 2015/02/28 00:24:42 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.158 $ */
+/* NetHack 3.5 options.c       $NHDT-Date: 1425083082 2015/02/28 00:24:42 $  $NHDT-Branch: master $:$NHDT-Revision: 1.158 $ */
 /* NetHack 3.5 options.c       $Date: 2012/04/09 02:56:30 $  $Revision: 1.153 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

diff --git a/src/pickup.c b/src/pickup.c
index fea45dce31814af2762156302e0ad0836289335d..d044cf46f570c29cd6db6ec242844c581ec5cd2b 100644 (file)
--- a/src/pickup.c
+++ b/src/pickup.c
@@ -1,4 +1,4 @@
-/* NetHack 3.5 pickup.c        $NHDT-Date: 1425081977 2015/02/28 00:06:17 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.126 $ */
+/* NetHack 3.5 pickup.c        $NHDT-Date: 1425081977 2015/02/28 00:06:17 $  $NHDT-Branch: master $:$NHDT-Revision: 1.126 $ */
 /* NetHack 3.5 pickup.c        $Date: 2012/02/16 03:01:38 $  $Revision: 1.123 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

diff --git a/src/save.c b/src/save.c
index d7828655ab615631e92295f1d6eaf172105ad5f6..b220f945d2b2f8d4b90f7620a91719ab7abb3ee4 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -1,4 +1,4 @@
-/* NetHack 3.5 save.c  $NHDT-Date: 1425081977 2015/02/28 00:06:17 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.59 $ */
+/* NetHack 3.5 save.c  $NHDT-Date: 1425081977 2015/02/28 00:06:17 $  $NHDT-Branch: master $:$NHDT-Revision: 1.59 $ */
 /* NetHack 3.5 save.c  $Date: 2012/02/16 02:40:24 $  $Revision: 1.53 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

diff --git a/sys/wince/mhstatus.c b/sys/wince/mhstatus.c
index 397f2dcb8692667328942cde8d4fb45b1fa3ca6f..a9a6b2855b8b3819ca5079aad2bb5ee5a192fb91 100644 (file)
--- a/sys/wince/mhstatus.c
+++ b/sys/wince/mhstatus.c
@@ -1,4 +1,4 @@
-/* NetHack 3.5 mhstatus.c      $NHDT-Date: 1425083082 2015/02/28 00:24:42 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.8 $ */
+/* NetHack 3.5 mhstatus.c      $NHDT-Date: 1425083082 2015/02/28 00:24:42 $  $NHDT-Branch: master $:$NHDT-Revision: 1.8 $ */
 /* NetHack 3.5 mhstatus.c      $Date: 2009/05/06 10:52:28 $  $Revision: 1.7 $ */
 /*     SCCS Id: @(#)mhstatus.c 3.5     2005/01/23      */
 /* Copyright (C) 2001 by Alex Kompel    */

diff --git a/util/makedefs.c b/util/makedefs.c
index b8a40199f4ca635cf6f1324d294c25be205dbfa9..f4ca9febbf5643525718887bc5c36d08c85a1356 100644 (file)
--- a/util/makedefs.c
+++ b/util/makedefs.c
@@ -1,4 +1,4 @@
-/* NetHack 3.5  makedefs.c  $NHDT-Date: 1425083082 2015/02/28 00:24:42 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.63 $ */
+/* NetHack 3.5  makedefs.c  $NHDT-Date: 1425083082 2015/02/28 00:24:42 $  $NHDT-Branch: master $:$NHDT-Revision: 1.63 $ */
 /* NetHack 3.5  makedefs.c  $Date: 2012/01/15 09:27:03 $  $Revision: 1.50 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* Copyright (c) M. Stephenson, 1990, 1991.                      */

diff --git a/win/X11/winstat.c b/win/X11/winstat.c
index ae2a3ce839f3c79a8bd9b7c5e7fc2b3ffb0ee6d8..3267e26bef27e68da175d55b5ef74f4972c69d4e 100644 (file)
--- a/win/X11/winstat.c
+++ b/win/X11/winstat.c
@@ -1,4 +1,4 @@
-/* NetHack 3.5 winstat.c       $NHDT-Date: 1425083083 2015/02/28 00:24:43 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.5 $ */
+/* NetHack 3.5 winstat.c       $NHDT-Date: 1425083083 2015/02/28 00:24:43 $  $NHDT-Branch: master $:$NHDT-Revision: 1.5 $ */
 /* NetHack 3.5 winstat.c       $Date: 2009/05/06 10:55:59 $  $Revision: 1.4 $ */
 /*     SCCS Id: @(#)winstat.c  3.5     1996/04/05      */
 /* Copyright (c) Dean Luick, 1992                                */

diff --git a/win/gnome/gnstatus.c b/win/gnome/gnstatus.c
index 5109f5bb7d26308008682a903a5631e5a4181bf9..2f1cea0753b057e0a823498d6fac9602d8137e92 100644 (file)
--- a/win/gnome/gnstatus.c
+++ b/win/gnome/gnstatus.c
@@ -1,4 +1,4 @@
-/* NetHack 3.5 gnstatus.c      $NHDT-Date: 1425083083 2015/02/28 00:24:43 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.6 $ */
+/* NetHack 3.5 gnstatus.c      $NHDT-Date: 1425083083 2015/02/28 00:24:43 $  $NHDT-Branch: master $:$NHDT-Revision: 1.6 $ */
 /* NetHack 3.5 gnstatus.c      $Date: 2009/05/06 10:57:54 $  $Revision: 1.5 $ */
 /*     SCCS Id: @(#)gnstatus.c 3.5     2000/07/16      */
 /* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */

diff --git a/win/share/tilemap.c b/win/share/tilemap.c
index 06c9661137d6f3eb80c369bd03f92e4fc47fec8d..bb8273f47738b787bf68dc3aba74713168c39c5d 100644 (file)
--- a/win/share/tilemap.c
+++ b/win/share/tilemap.c
@@ -1,4 +1,4 @@
-/* NetHack 3.5 tilemap.c       $NHDT-Date: 1425082379 2015/02/28 00:12:59 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.12 $ */
+/* NetHack 3.5 tilemap.c       $NHDT-Date: 1425082379 2015/02/28 00:12:59 $  $NHDT-Branch: master $:$NHDT-Revision: 1.12 $ */
 /* NetHack 3.5 tilemap.c       $Date: 2009/05/06 10:59:02 $  $Revision: 1.7 $ */
 /*     SCCS Id: @(#)tilemap.c  3.5     2000/06/04      */
 /* NetHack may be freely redistributed.  See license for details. */

diff --git a/win/tty/topl.c b/win/tty/topl.c
index db307b73aa29162fac4893528820bb5539e76d55..cc4df15d5c141ec53d2c46954211232b1dd1702b 100644 (file)
--- a/win/tty/topl.c
+++ b/win/tty/topl.c
@@ -1,4 +1,4 @@
-/* NetHack 3.5 topl.c  $NHDT-Date: 1425081315 2015/02/27 23:55:15 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.24 $ */
+/* NetHack 3.5 topl.c  $NHDT-Date: 1425081315 2015/02/27 23:55:15 $  $NHDT-Branch: master $:$NHDT-Revision: 1.24 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */