Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource

.gitignore

@@ -27,5 +27,19 @@ _$*
 core
 # CVS default ignores end
 .*.swp
+
 # We generate makefiles by shell script
 Makefile
+
+# Win32-specific ignores
+binary/
+build/
+Nethack.sln
+Nethack.sdf
+Nethack.opensdf
+Makefile.bcc
+Makefile.gcc
+*.pdb
+*.ilk
+# Win32-specific ignores end
+

dat/.gitignore

@@ -14,3 +14,6 @@ dungeon
 nethack.png
 nhsplash.xpm
 nhdat
+dlb.lst
+guioptions
+porthelp

include/.gitignore

@@ -1,3 +1,7 @@
 .cvsignore
-date.h onames.h pm.h vis_tab.h
-dgn_comp.h lev_comp.h
+date.h
+onames.h
+pm.h
+vis_tab.h
+dgn_comp.h
+lev_comp.h

src/.gitignore

@@ -6,3 +6,4 @@ tile.c
 Sysunix
 nethack
 *.o
+tiles.bmp

src/cmd.c

@@ -1276,7 +1276,7 @@ int final;	/* ENL_GAMEINPROGRESS:0, ENL_GAVEOVERALIVE, ENL_GAMEOVERDEAD */
     *tmpbuf = highc(*tmpbuf);	/* same adjustment as bottom line */
     /* as in background_enlighenment, when poly'd we need to use the saved
        gender in u.mfemale rather than the current you-as-monster gender */
-    Sprintf(buf, "%s the %s's atttributes:", tmpbuf,
+    Sprintf(buf, "%s the %s's attributes:", tmpbuf,
 	    ((Upolyd ? u.mfemale : flags.female) && urole.name.f) ?
 		urole.name.f : urole.name.m);
 

sys/unix/sysconf

@@ -29,7 +29,7 @@ MAXPLAYERS=10
 # Record (high score) file options.
 # CAUTION: changing these after people have started playing games can
 #  lead to lost high scores!
-# Maximum entries for one persion.
+# Maximum entries for one person.
 #PERSMAX=10
 # Maximum entries in the record file.
 #ENTRYMAX=100

win/share/.gitignore

@@ -0,0 +1 @@
+tiletxt.c

win/win32/.gitignore

@@ -0,0 +1,4 @@
+# Build-generated stuff that we don't want
+*.bmp
+*.ico
+