pull in the recent unconditionals merge from master

win/gnome/gnbind.c

@@ -1,4 +1,5 @@
-/* NetHack 3.5	gnbind.c	$Date$  $Revision$ */
+/* NetHack 3.5	gnbind.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	gnbind.c	$Date: 2012/01/24 04:26:31 $  $Revision: 1.25 $ */
 /* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -1182,12 +1183,7 @@ void gnome_outrip(winid wid, int how, time_t when)
     Strcat(ripString, buf);
     
     /* Put $ on stone */
-    Sprintf(buf, "%ld Au\n",
-#ifndef GOLDOBJ
-		u.ugold);
-#else
-		done_money);
-#endif
+    Sprintf(buf, "%ld Au\n", done_money);
     Strcat(ripString, buf);
 
     /* Put together death description */