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

@ -57,7 +57,7 @@ class Field
if(mValue)
{
uint64 value;
sscanf(mValue,I64FMTD,&value);
sscanf(mValue,UI64FMTD,&value);
return value;
}
else