Merge branch 'master' into lsid

This commit is contained in:
Akkadius
2018-01-17 22:04:46 -06:00
50 changed files with 1915 additions and 1095 deletions
+1 -2
View File
@@ -17,7 +17,6 @@ character_bind
character_corpses
character_corpse_items
character_languages
character_lookup
character_skills
character_spells
character_memmed_spells
@@ -89,4 +88,4 @@ spell_globals
timers
trader
trader_audit
zone_flags
zone_flags