Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Entities/Unit/Unit.cpp src/server/game/Spells/Auras/SpellAuras.cpp src/server/scripts/World/action_ip_logger.cpp
This commit is contained in:
commit
f0c366141b
16 files changed
+1926
-966
No files matched your search
@@ -877,7 +877,7 @@ unsigned nestingLevel,
|
||||
DWORD_PTR offset,
|
||||
bool & bHandled,
|
||||
const char* Name,
|
||||
char* suffix,
|
||||
char* /*suffix*/,
|
||||
bool newSymbol,
|
||||
bool logChildren)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user