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_npc.cpp
This commit is contained in:
Vincent-Michael committed 2013-08-05 21:15:35 +02:00
2 parents 341dabb423 d24bb958da
commit 2d3fd62aee
5 files changed
+12 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/scripts/Commands/cs_npc.cpp
+1 -1
View File
@@ -123,7 +123,7 @@ struct UnitFlag
#define UNIT_FLAGS_MAX 33
UnitFlag const unitFlags[MECHANIC_MAX] =
UnitFlag const unitFlags[UNIT_FLAGS_MAX] =
{
{ UNIT_FLAG_SERVER_CONTROLLED , "UNIT_FLAG_SERVER_CONTROLLED" },
{ UNIT_FLAG_NON_ATTACKABLE , "UNIT_FLAG_NON_ATTACKABLE" },