Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts: src/server/game/AI/EventAI/CreatureEventAI.h src/server/game/Achievements/AchievementMgr.h src/server/game/Battlegrounds/Battleground.h src/server/game/DataStores/DBCEnums.h src/server/game/Entities/Object/ObjectDefines.h src/server/game/Entities/Object/Updates/UpdateFields.h src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h src/server/game/Entities/Unit/Unit.h src/server/game/Groups/Group.h src/server/game/Guilds/Guild.h src/server/game/Instances/InstanceScript.h src/server/game/Miscellaneous/SharedDefines.h src/server/game/Movement/Spline/MoveSplineFlag.h src/server/game/OutdoorPvP/OutdoorPvP.h src/server/game/Quests/QuestDef.h src/server/game/Spells/Spell.h src/server/game/Spells/SpellInfo.h
This commit is contained in:
commit
68e0ef8039
115 files changed
+616
-447
No files matched your search
@@ -546,7 +546,7 @@ enum CharacterDatabaseStatements
|
||||
CHAR_REP_GUILD_FINDER_GUILD_SETTINGS,
|
||||
CHAR_DEL_GUILD_FINDER_GUILD_SETTINGS,
|
||||
|
||||
MAX_CHARACTERDATABASE_STATEMENTS,
|
||||
MAX_CHARACTERDATABASE_STATEMENTS
|
||||
};
|
||||
|
||||
#endif
|
||||
Reference in new issue
Block a user