Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source 
Conflicts:
	src/server/scripts/Commands/cs_reload.cpp
This commit is contained in:
Vincent_Michael committed 2013-01-03 23:41:36 +01:00
2 parents a28d2d22f3 51b5e04a88
commit 00ca57e2cf
13 files changed
+103 -72
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/AI/SmartScripts/SmartScriptMgr.h
+2 -2
View File
@@ -997,7 +997,7 @@ struct SmartTarget
struct
{
uint32 guid;
uint32 dbGuid;
uint32 entry;
} unitGUID;
@@ -1032,7 +1032,7 @@ struct SmartTarget
struct
{
uint32 guid;
uint32 dbGuid;
uint32 entry;
} goGUID;