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/win/share/ppmwrite.c
+++ b/win/share/ppmwrite.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5  ppmwrite.c	$Date$  $Revision$ */
+/* NetHack 3.5  ppmwrite.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5  ppmwrite.c	$Date: 2009/05/06 10:59:00 $  $Revision: 1.2 $ */
 /* this produces a raw ppm file, with a 15-character header of
 * "P6 3-digit-width 3-digit-height 255\n"
 */