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

Conflicts:
	src/server/game/Entities/Item/Item.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h

2012-12-23 08:33:13 -05:00

..

Map.cpp

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

2012-12-23 08:33:13 -05:00

Map.h

Merge branch 'master' into 4.3.4

2012-12-07 09:22:43 +01:00

MapInstanced.cpp

Core/Misc: Set mode 0644 for files

2012-11-27 13:03:12 +01:00

MapInstanced.h

Core/Misc: Set mode 0644 for files

2012-11-27 13:03:12 +01:00

MapManager.cpp

Merge branch 'master' into 4.3.4

2012-11-27 14:15:12 +01:00

MapManager.h

Merge branch 'master' into 4.3.4

2012-11-27 14:15:12 +01:00

MapReference.h

Core/Misc: Set mode 0644 for files

2012-11-27 13:03:12 +01:00

MapRefManager.h

Core/Misc: Set mode 0644 for files

2012-11-27 13:03:12 +01:00

MapUpdater.cpp

Core/Build: Enable Clang PCH support and OS X specific features

2012-11-09 13:13:45 +01:00

MapUpdater.h

Core: Remove lots warnings:

2010-08-21 20:08:47 +02:00

PhaseMgr.cpp

Merge branch 'master' into 4.3.4

2012-11-20 16:01:31 +01:00

PhaseMgr.h

Fix compile without pch

2012-10-16 09:35:15 +02:00

ZoneScript.h

Core/Misc: Set mode 0644 for files

2012-11-27 13:03:12 +01:00