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

Conflicts:
	src/server/scripts/EasternKingdoms/zone_ironforge.cpp
	src/server/scripts/Spells/spell_generic.cpp

2013-07-17 20:24:29 +02:00

..

authserver

Core/Config: Refactored ConfigMgr

2013-07-15 17:31:44 +02:00

collision

Tools/Extractors: Fixed possible name issues (underscore instead of space) when attempting to extract M2 models from MPQ

2013-06-27 19:31:38 +02:00

game

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

2013-07-16 23:51:11 +01:00

scripts

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

2013-07-17 20:24:29 +02:00

shared

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

2013-07-15 18:04:04 +02:00

worldserver

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

2013-07-15 18:04:04 +02:00

CMakeLists.txt

Buildsystem/MSVC

2013-06-15 14:07:12 +02:00