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

Conflicts:
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h

2014-09-21 12:11:03 +02:00

..

auth

Scripts/Commands: Implement .guild info command

2014-08-28 23:04:52 +01:00

characters

Merge branch 'ObjectGuid' of https://github.com/TrinityCore/TrinityCore

2014-09-16 21:50:01 +02:00

world

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

2014-09-21 12:11:03 +02:00