Merge commit 'f0ecccf013e6e84020d2a933352d871bb026adef' into 400

[newsbot]

автор: VladimirMangos


<pre>m CMakeLists.txt
m contrib/soap/example.php
m contrib/vmap_assembler/CMakeLists.txt
m contrib/vmap_assembler/vmap_assembler.cpp
m contrib/vmap_extractor_v3/CMakeLists.txt
m contrib/vmap_extractor_v3/vmapextract/CMakeLists.txt
m contrib/vmap_extractor_v3/vmapextract/adtfile.cpp
m contrib/vmap_extractor_v3/vmapextract/adtfile.h
m contrib/vmap_extractor_v3/vmapextract/dbcfile.cpp
m contrib/vmap_extractor_v3/vmapextract/dbcfile.h
m contrib/vmap_extractor_v3/vmapextract/loadlib/loadlib.h
m contrib/vmap_extractor_v3/vmapextract/model.cpp
m contrib/vmap_extractor_v3/vmapextract/model.h
m contrib/vmap_extractor_v3/vmapextract/modelheaders.h
m contrib/vmap_extractor_v3/vmapextract/vmapexport.cpp
m contrib/vmap_extractor_v3/vmapextract/vmapexport.h
m contrib/vmap_extractor_v3/vmapextract/wdtfile.cpp
m contrib/vmap_extractor_v3/vmapextract/wdtfile.h
m contrib/vmap_extractor_v3/vmapextract/wmo.cpp
m contrib/vmap_extractor_v3/vmapextract/wmo.h
m dep/CMakeLists.txt
- dep/include/vld/vld.h
- dep/lib/win32_debug/vld.dll
- dep/lib/win32_debug/vld.lib
m sql/mangos.sql
m sql/mangos_spell_check.sql
+ sql/updates/11190_01_mangos_pool_creature_template.sql
+ sql/updates/11190_01_mangos_pool_gameobject_template.sql
+ sql/updates/11200_01_mangos_spell_bonus_data.sql
+ sql/updates/11205_01_mangos_spell_proc_event.sql
+ sql/updates/11214_01_mangos_mangos_string.sql
+ sql/updates/11214_02_mangos_command.sql
+ sql/updates/11217_01_mangos_creature_addon.sql
+ sql/updates/11234_01_mangos_command.sql
m src/framework/Utilities/Callback.h
m src/game/AchievementMgr.cpp
m src/game/CharacterHandler.cpp
m src/game/Chat.cpp
m src/game/Chat.h
m src/game/Corpse.cpp
m src/game/Creature.cpp
m src/game/Creature.h
m src/game/DBCStores.cpp
m src/game/DBCStructure.cpp
m src/game/DBCStructure.h
m src/game/DynamicObject.cpp
m src/game/DynamicObject.h
m src/game/GameObject.cpp
m src/game/GridMap.h
m src/game/GridNotifiers.h
m src/game/GridNotifiersImpl.h
m src/game/InstanceData.cpp
m src/game/Item.cpp
m src/game/ItemPrototype.h
m src/game/Language.h
m src/game/Level2.cpp
m src/game/Level3.cpp
m src/game/LootMgr.cpp
m src/game/LootMgr.h
m src/game/Mail.cpp
m src/game/Mail.h
m src/game/Map.cpp
m src/game/Map.h
m src/game/MapPersistentStateMgr.cpp
m src/game/MapPersistentStateMgr.h
m src/game/MiscHandler.cpp
m src/game/Object.cpp
m src/game/Object.h
m src/game/ObjectMgr.cpp
m src/game/Pet.cpp
m src/game/Pet.h
m src/game/Player.cpp
m src/game/Player.h
m src/game/PointMovementGenerator.cpp
m src/game/PoolManager.cpp
m src/game/QuestDef.cpp
m src/game/ReputationMgr.cpp
m src/game/ScriptMgr.cpp
m src/game/ScriptMgr.h
m src/game/SharedDefines.h
m src/game/Spell.cpp
m src/game/SpellAuras.cpp
m src/game/SpellAuras.h
m src/game/SpellEffects.cpp
m src/game/SpellHandler.cpp
m src/game/SpellMgr.cpp
m src/game/TemporarySummon.h
m src/game/Totem.cpp
m src/game/Totem.h
m src/game/Unit.cpp
m src/game/Unit.h
m src/game/UnitAuraProcHandler.cpp
m src/game/Vehicle.cpp
m src/game/Vehicle.h
m src/game/World.cpp
m src/game/World.h
m src/game/WorldSession.cpp
m src/game/debugcmds.cpp
m src/mangosd/CMakeLists.txt
m src/mangosd/Main.cpp
m src/mangosd/mangosd.conf.dist.in
m src/realmd/realmd.conf.dist.in
m src/shared/Common.h
m src/shared/Database/DBCFileLoader.cpp
m src/shared/Database/DBCFileLoader.h
m src/shared/Database/Database.cpp
m src/shared/Database/Database.h
m src/shared/Database/DatabaseMysql.cpp
m src/shared/Database/DatabaseMysql.h
m src/shared/Database/Field.h
m src/shared/Database/SQLStorage.cpp
m src/shared/Database/SQLStorageImpl.h
m src/shared/Database/SqlOperations.cpp
m src/shared/Database/SqlOperations.h
+ src/shared/Database/SqlPreparedStatement.cpp
+ src/shared/Database/SqlPreparedStatement.h
- src/shared/MemoryLeaks.cpp
- src/shared/MemoryLeaks.h
m src/shared/revision_nr.h
m src/shared/revision_sql.h
m win/VC100/shared.vcxproj
m win/VC100/shared.vcxproj.filters
m win/VC80/mangosd.vcproj
m win/VC80/shared.vcproj
m win/VC90/shared.vcproj
</pre>
<pre style='white-space:pre-wrap;width:81ex'>Merge commit 'f0ecccf013e6e84020d2a933352d871bb026adef' into 400</pre>




Дальше...