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

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/scripts/World/action_ip_logger.cpp
This commit is contained in:
Vincent-Michael
2014-06-24 18:26:52 +02:00
16 changed files with 1926 additions and 966 deletions
+1 -1
View File
@@ -34,7 +34,7 @@ zlib (A Massively Spiffy Yet Delicately Unobtrusive Compression Library)
gSOAP (a portable development toolkit for C and C++ XML Web services and XML data bindings)
http://gsoap2.sourceforge.net/
Version: 2.8.10
Version: 2.8.17r
recastnavigation (Recast is state of the art navigation mesh construction toolset for games)
https://github.com/memononen/recastnavigation