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

Conflicts:
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectMgr.h

2014-05-03 20:23:44 +02:00

..

Management

Core/Misc: Remove remaining COMPILER_HAS_CPP11_SUPPORT related macros

2014-05-01 11:19:32 +02:00

Maps

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

2014-05-03 20:23:44 +02:00

Models

Core/Misc: Remove remaining COMPILER_HAS_CPP11_SUPPORT related macros

2014-05-01 11:19:32 +02:00

PrecompiledHeaders

Core/BuildSystem: Added some more headers to the collisions project PCH

2012-12-24 10:34:36 -05:00

BoundingIntervalHierarchy.cpp

Update copyright note for 2014.

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

BoundingIntervalHierarchy.h

Update copyright note for 2014.

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

BoundingIntervalHierarchyWrapper.h

Update copyright note for 2014.

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

CMakeLists.txt

Update copyright note for 2014.

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

DynamicTree.cpp

Update copyright note for 2014.

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

DynamicTree.h

Update copyright note for 2014.

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

RegularGrid.h

Core/Misc: Remove using directive from header files (It will eventually lead to name collisions)

2013-01-30 09:06:19 +01:00

VMapDefinitions.h

Update copyright note for 2014.

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

VMapTools.h

Update copyright note for 2014.

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