Rat eebc468e62 Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x ...

Conflicts:
	src/server/collision/Management/MMapManager.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h

2015-03-24 20:01:02 +01:00

..

bnetserver

Core/DBUpdater: Add the possibility to limit the remove of orphaned entries.

2015-03-24 12:31:52 +01:00

collision

Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x

2015-03-24 20:01:02 +01:00

game

Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x

2015-03-24 20:01:02 +01:00

ipc

Update copyright note for 2015

2015-01-01 00:28:09 +01:00

scripts

Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x

2015-03-24 20:01:02 +01:00

shared

Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x

2015-03-24 20:01:02 +01:00

worldserver

Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x

2015-03-24 20:01:02 +01:00

CMakeLists.txt

Update copyright note for 2015

2015-01-01 00:28:09 +01:00