mirror of
https://github.com/mangosfour/server.git
synced 2025-12-26 07:37:02 +00:00
Merge remote branch 'origin/master' into 330
Conflicts: src/game/Unit.cpp
This commit is contained in:
commit
e73c5d3b79
177 changed files with 24212 additions and 2127 deletions
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue