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/dat/Monk.des
+++ b/dat/Monk.des
@@ -1,4 +1,5 @@
-# NetHack 3.5	Monk.des	$Date$  $Revision$
+# NetHack 3.5	Monk.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	Monk.des	$Date: 2009/05/06 10:44:16 $  $Revision: 1.6 $
 #	SCCS Id: @(#)Monk.des	3.5	2002/04/08
 #	Copyright (c) 1989 by Jean-Christophe Collet
 #	Copyright (c) 1991-2 by M. Stephenson