Conflicts: doc/fixes35.0 include/extern.h include/ntconf.h include/obj.h include/patchlevel.h src/dig.c src/do.c src/files.c src/fountain.c src/mklev.c src/objnam.c src/options.c src/potion.c src/rumors.c src/save.c src/topten.c src/trap.c src/wield.c sys/share/pcmain.c sys/unix/unixmain.c sys/winnt/Makefile.msc util/lev_main.c util/makedefs.c