Merge commit 'origin/master' into 310

Conflicts:
	src/game/SpellAuras.cpp
This commit is contained in:
tomrus88 2009-05-31 12:16:25 +04:00
commit cae3f0a532
53 changed files with 1074 additions and 954 deletions

View file

@ -1240,7 +1240,7 @@ struct SkillLineEntry
uint32 spellIcon; // 37 m_spellIconID
//char* alternateVerb[16]; // 38-53 m_alternateVerb_lang
// 54 string flags
// 55 m_canLink
uint32 canLink; // 55 m_canLink (prof. with recipes
};
struct SkillLineAbilityEntry