Arthur Ice cff96b23a8 Merge branch 'master' into RunQueryToDatabaseQuery_database ...

Conflicts:
	changelog.txt
	common/spdat.h
	zone/attack.cpp
	zone/bonuses.cpp
	zone/common.h
	zone/mob.h
	zone/special_attacks.cpp
	zone/spell_effects.cpp

2014-07-10 14:15:05 -07:00

..

git

Merge branch 'master' into RunQueryToDatabaseQuery_database

2014-07-10 14:15:05 -07: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