Merge remote branch 'origin/master' into 330

Conflicts:
	src/game/Unit.cpp
This commit is contained in:
tomrus88 2010-03-10 20:24:28 +03:00
commit e73c5d3b79
177 changed files with 24212 additions and 2127 deletions

View file

@ -32,7 +32,7 @@
#include "Log.h"
#include "World.h"
#include "ObjectMgr.h"
#include "ObjectDefines.h"
#include "ObjectGuid.h"
#include "Player.h"
#include "UpdateMask.h"
#include "Unit.h"