Merge branch 'master' into nhmall-booktribute

Conflicts:
	include/context.h

diff --cc include/context.h
index fad18f82714a0aa389349d343e210f5b26e5ab19,7a73344afde873dd13fbf39a7890503d1823c3dd..d25af437109a62c6164bbc84bc9726e1e3f2a540
--- 1/include/context.h
--- 2/include/context.h
+++ b/include/context.h
@@@ -73,14 -73,11 +73,19 @@@ struct warntype_info 
        short speciesidx;       /* index of above in mons[] (for save/restore) */
  };
  
+ struct polearm_info {
+       struct monst *hitmon;   /* the monster we tried to hit last */
+       unsigned m_id;          /* monster id of hitmon, in save file */
+ };
+ 
 +struct tribute_info {
 +      size_t tributesz;       /* make it possible to skip this in future */
 +      boolean  enabled;       /* Do we have tributes turned on? */
 +      Bitfield(bookstock,1);  /* Have we stocked the book? */
 +                              /* Markers for other tributes can go here */
 +      /* 31 free bits */
 +};
 +      
  struct context_info {
        unsigned ident;         /* social security number for each monster */
        unsigned no_of_wizards; /* 0, 1 or 2 (wizard and his shadow) */
@@@ -111,7 -108,7 +116,11 @@@
        struct book_info spbook;
        struct takeoff_info takeoff;
        struct warntype_info warntype;
++<<<<<<< HEAD
 +      struct tribute_info tribute;
++=======
+       struct polearm_info polearm;
++>>>>>>> master
  };
  
  extern NEARDATA struct context_info context;

diff --cc include/extern.h
Simple merge

diff --cc include/obj.h
Simple merge

diff --cc src/allmain.c
Simple merge

diff --cc src/do_name.c
Simple merge

diff --cc src/files.c
Simple merge

diff --cc src/mon.c
Simple merge

diff --cc src/objnam.c
Simple merge

diff --cc src/read.c
Simple merge

diff --cc src/spell.c
Simple merge

diff --cc sys/winnt/Makefile.msc
Simple merge