Merge branch 'master' of https://github.com/cmangos/mangos-cata

[newsbot]

Автор: kid10


<pre>m .gitignore
+ .travis.yml
m README.md
+ contrib/extractor/VC110_AD.sln
+ contrib/extractor/VC110_ad.vcxproj
+ contrib/extractor/VC110_ad.vcxproj.filters
+ contrib/git_id/git_id_vc110.sln
+ contrib/git_id/git_id_vc110.vcxproj
+ contrib/git_id/git_id_vc110.vcxproj.filters
m contrib/mmap/win/MoveMapGen_VC110.sln
m contrib/mmap/win/VC110/MoveMapGen_VC110.vcxproj
+ contrib/vmap_assembler/VC110/vmap_assembler.vcxproj
+ contrib/vmap_assembler/vmap_assemblerVC110.sln
+ contrib/vmap_extractor/win/VC110/vmapExtractor.vcxproj
+ contrib/vmap_extractor/win/VC110/vmapExtractor.vcxproj.filters
+ contrib/vmap_extractor/win/vmapExtractor_VC110.sln
+ dep/StormLib/StormLib_vc110.vcxproj
m dep/recastnavigation/Detour/win/Detour_VC110.sln
m dep/recastnavigation/Detour/win/VC110/Detour.vcxproj
m dep/recastnavigation/Recast/win/Recast_VC110.sln
m dep/recastnavigation/Recast/win/VC110/Recast.vcxproj
m dep/tbb/include/tbb/tbb_config.h
m dep/tbb/include/tbb/tbb_exception.h
m src/game/MiscHandler.cpp
m src/game/Player.cpp
m src/game/Player.h
m src/game/Spell.cpp
m src/game/Spell.h
m src/game/SpellAuraDefines.h
m src/game/SpellAuras.cpp
m src/game/SpellAuras.h
m src/game/SpellHandler.cpp
m src/game/StatSystem.cpp
m src/game/Unit.cpp
m src/game/Unit.h
m src/game/UnitAuraProcHandler.cpp
m src/shared/revision_nr.h
m win/VC110/ACE_vc11.vcxproj
+ win/VC110/Precompiled Headers.props
m win/VC110/bzip2.vcxproj
m win/VC110/framework.vcxproj
m win/VC110/g3dlite.vcxproj
m win/VC110/game.vcxproj
m win/VC110/game.vcxproj.filters
m win/VC110/genrevision.vcxproj
m win/VC110/mangosd.vcxproj
m win/VC110/realmd.vcxproj
m win/VC110/shared.vcxproj
m win/VC110/shared.vcxproj.filters
m win/VC110/tbb.vcxproj
m win/VC110/tbbmalloc.vcxproj
m win/VC110/zlib.vcxproj
m win/mangosdVC110.sln
</pre>
<pre style='white-space:pre-wrap;width:81ex'>Merge branch 'master' of https://github.com/cmangos/mangos-cata</pre>


Подробнее... (https://github.com/cmangos/mangos-cata/commit/aadcbac30ec18201a6d36802ae395c02641fcf60)