Merge branch '0.74-penndev' into HEAD
Conflicts:
INSTALL
MANIFEST
MANIFEST.new
Makefile.SH
Patchlevel
README
UPGRADING
game/txt/hlp/cobra_chat.hlp
game/txt/hlp/cobra_func.hlp
hdrs/attrib.h
hdrs/flags.h
hdrs/version.h
src/Makefile.SH
src/attrib.c
src/bsd.c
src/command.c
src/conf.c
src/console.c
src/filecopy.c
src/flags.c
src/function.c
src/funlist.c
src/funstr.c
src/funtime.c
src/game.c
src/local.dst
src/lock.c
src/player.c
src/rplog.c
src/set.c
src/wild.c
utils/mkcmds.sh.SH
utils/mkvershlp.pl
utils/preparedist.sh
55 files changed: