pull in the recent unconditionals merge from master

2015-02-27 21:25:00 -05:00
parent 7f0ff8f011
commit b1a7bbbbdb
538 changed files with 1715 additions and 5685 deletions
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	alloc.c	$Date$  $Revision$ */
+/* NetHack 3.5	alloc.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	alloc.c	$Date: 2012/01/29 03:00:17 $  $Revision: 1.8 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */