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

Conflicts:
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/shared/Database/Implementation/WorldDatabase.cpp

2014-04-28 09:42:20 +02:00

..

base

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

2014-04-25 23:42:40 +02:00

create

Buildsystem: Stop the retarded recursive hunting for CMakeLists.txt when copying SQL-files nad use the proper method for direct copying.

2010-12-24 18:33:11 +01:00

old

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

2014-04-05 20:43:05 +02:00

updates

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

2014-04-28 09:42:20 +02:00