git.theari.com Git - cobramush.git/commit

projects / cobramush.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 410bc64 6d110b8)

author	Ari Johnson <ari@theari.com>
	Mon, 19 Jan 2015 19:16:11 +0000 (14:16 -0500)
committer	Ari Johnson <ari@theari.com>
	Mon, 19 Jan 2015 19:16:11 +0000 (14:16 -0500)
commit	922848a908bd4ce05a368557b3fc5e0dbb58d2a5
tree	fc769649be389a7c7290c7979fa9734b48906a21	tree \| snapshot
parent	410bc6443e31f39b479c76d875222e9fd702702d	commit \| diff
parent	6d110b87bf70c2b51669bf9c10e8c60abf685ab0	commit \| diff

Merge remote-tracking branch 'origin/0.73-development'

Also update code so that everything compiles

20 files changed:

.gitignore	diff1 \|	diff2 \|	blob \| history
Makefile.in	diff1 \|	\|	blob \| history
game/mushcnf.dst	diff1 \|	diff2 \|	blob \| history
game/txt/hlp/cobra_chat.hlp	diff1 \|	diff2 \|	blob \| history
game/txt/hlp/cobra_func.hlp	diff1 \|	diff2 \|	blob \| history
hdrs/conf.h	diff1 \|	diff2 \|	blob \| history
hdrs/extchat.h	diff1 \|	diff2 \|	blob \| history
hdrs/mushdb.h	diff1 \|	diff2 \|	blob \| history
m4/ax_lua.m4	diff1 \|	\|	blob \| history
src/bsd.c	diff1 \|	diff2 \|	blob \| history
src/conf.c	diff1 \|	diff2 \|	blob \| history
src/division.c	diff1 \|	diff2 \|	blob \| history
src/extchat.c	diff1 \|	diff2 \|	blob \| history
src/funmath.c	diff1 \|	diff2 \|	blob \| history
src/funmisc.c	diff1 \|	diff2 \|	blob \| history
src/game.c	diff1 \|	diff2 \|	blob \| history
src/mushlua.c	diff1 \|	\|	blob \| history
src/set.c	diff1 \|	diff2 \|	blob \| history
src/speech.c	diff1 \|	diff2 \|	blob \| history
utils/mkcmds.pl	diff1 \|	diff2 \|	blob \| history