Vincent_Michael b69dff28db Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps ...

Conflicts:
	src/server/game/World/World.cpp
	src/server/worldserver/worldserver.conf.dist

2013-01-07 16:57:39 +01:00

..

characters

SQL: Rename SQL merged in PR

2012-12-20 16:48:24 +01:00

world

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

2013-01-07 16:57:39 +01:00