Merge branch '0.74-penndev' into HEAD
authorRick L Bird <nveid@yahoo.com>
Sun, 10 Apr 2011 17:16:50 +0000 (13:16 -0400)
committerRick L Bird <nveid@yahoo.com>
Sun, 10 Apr 2011 17:16:50 +0000 (13:16 -0400)
commitb1b6147b2d51b23f7451812a6bb7ade690f71f53
tree8341e703f5e1aafb1547e25e5f910481d5c7df0d
parent5e77633468044f4c826b9374e0697ac75a89cd96
parentd8a46790366a058e2e10db035cd91e9007da3799
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:
MANIFEST
Makefile.SH
game/mushcnf.dst
game/txt/hlp/cobra_chat.hlp
game/txt/hlp/cobra_cmd.hlp
game/txt/hlp/cobra_func.hlp
game/txt/hlp/cobratop.hlp
hdrs/attrib.h
hdrs/externs.h
hdrs/flags.h
hdrs/mushtype.h
hdrs/parse.h
options.h.dist
src/Makefile.SH
src/atr_tab.c
src/attrib.c
src/boolexp.c
src/bsd.c
src/cmds.c
src/command.c
src/conf.c
src/cque.c
src/db.c
src/destroy.c
src/division.c
src/extchat.c
src/extmail.c
src/filecopy.c
src/flags.c
src/function.c
src/fundb.c
src/funlist.c
src/funmisc.c
src/funstr.c
src/funtime.c
src/game.c
src/lock.c
src/look.c
src/move.c
src/notify.c
src/parse.c
src/player.c
src/predicat.c
src/prog.c
src/services.c
src/set.c
src/speech.c
src/sql.c
src/strutil.c
src/timer.c
src/unparse.c
src/utils.c
src/wild.c
src/wiz.c
utils/preparedist.sh