Akkadius 3d74035e24 Merge remote-tracking branch 'remotes/origin/master' into logging_changes ...

Conflicts:
	zone/command.cpp
	zone/command.h
	zone/inventory.cpp

2015-01-21 16:40:46 -06:00

..

git

Merge remote-tracking branch 'remotes/origin/master' into logging_changes

2015-01-21 16:40:46 -06:00

svn

Moved merc save data from extended player profile to new merc table, save merc buffs, added cure and rez spells to healer merc.

2013-02-18 00:50:19 -05:00

db_update_manifest.txt

Update default npc_types values for previous NULL entries.

2014-12-31 20:53:12 -05:00

peq_aa_tables.sql

Upload of peq_aa_tables.sql for db management interface

2014-11-19 02:30:59 -06:00