Vincent-Michael 741f3dde2e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 ...

Conflicts:
	dep/PackageList.txt
	src/server/game/Spells/Auras/SpellAuras.cpp

2014-08-26 19:21:22 +02:00

..

Map.cpp

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

2014-08-26 19:21:22 +02:00

Map.h

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

2014-08-12 00:45:24 +02:00

MapInstanced.cpp

Replaced mutex related code in Common.h

2014-06-08 15:30:57 +02:00

MapInstanced.h

Core/Server: Add missing overrides

2014-08-09 20:17:40 +01:00

MapManager.cpp

Merge remote-tracking branch 'origin/master' into 4.3.4

2014-07-19 03:51:11 +02:00

MapManager.h

Refactored singletons to enable proper deconstruction during shutdown

2014-07-20 00:40:08 +02:00

MapReference.h

Core/Server: Add missing overrides

2014-08-09 20:17:40 +01:00

MapRefManager.h

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

MapUpdater.cpp

Prevent duplicate call to MapUpdater::deactivate causing a crash on shutdown

2014-07-20 14:39:35 +02:00

MapUpdater.h

Remove extra qualifier to make GCC happy again

2014-07-20 14:45:23 +02:00

TransportMgr.cpp

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

2014-08-24 02:11:33 +02:00

TransportMgr.h

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

2014-07-20 03:06:03 +02:00

ZoneScript.h

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00